aboutsummaryrefslogtreecommitdiff
path: root/sound/arm/aaci.h
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-01-07 03:50:18 -0500
committerLen Brown <len.brown@intel.com>2006-01-07 03:50:18 -0500
commited03f430cdc8c802652467e9097606fedc2c7abc (patch)
tree30941ec1e6f93e99358fefe18175e5dd800a4379 /sound/arm/aaci.h
parented349a8a0a780ed27e2a765f16cee54d9b63bfee (diff)
parent6f957eaf79356a32e838f5f262ee9a60544b1d5b (diff)
Pull pnpacpi into acpica branch
Diffstat (limited to 'sound/arm/aaci.h')
-rw-r--r--sound/arm/aaci.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/arm/aaci.h b/sound/arm/aaci.h
index b2f969bc784..83f73c2505c 100644
--- a/sound/arm/aaci.h
+++ b/sound/arm/aaci.h
@@ -207,7 +207,7 @@ struct aaci_runtime {
int pcm_open;
u32 cr;
- snd_pcm_substream_t *substream;
+ struct snd_pcm_substream *substream;
/*
* PIO support
@@ -222,7 +222,7 @@ struct aaci_runtime {
struct aaci {
struct amba_device *dev;
- snd_card_t *card;
+ struct snd_card *card;
void __iomem *base;
unsigned int fifosize;
@@ -236,7 +236,7 @@ struct aaci {
struct aaci_runtime playback;
struct aaci_runtime capture;
- snd_pcm_t *pcm;
+ struct snd_pcm *pcm;
};
#define ACSTREAM_FRONT 0