diff options
| author | Len Brown <len.brown@intel.com> | 2006-01-07 03:50:18 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-01-07 03:50:18 -0500 |
| commit | ed03f430cdc8c802652467e9097606fedc2c7abc (patch) | |
| tree | 30941ec1e6f93e99358fefe18175e5dd800a4379 /sound/pci/au88x0/au88x0_core.c | |
| parent | ed349a8a0a780ed27e2a765f16cee54d9b63bfee (diff) | |
| parent | 6f957eaf79356a32e838f5f262ee9a60544b1d5b (diff) | |
| download | op-kernel-dev-ed03f430cdc8c802652467e9097606fedc2c7abc.zip op-kernel-dev-ed03f430cdc8c802652467e9097606fedc2c7abc.tar.gz | |
Pull pnpacpi into acpica branch
Diffstat (limited to 'sound/pci/au88x0/au88x0_core.c')
| -rw-r--r-- | sound/pci/au88x0/au88x0_core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/au88x0/au88x0_core.c b/sound/pci/au88x0/au88x0_core.c index 5905188..e3394fe 100644 --- a/sound/pci/au88x0/au88x0_core.c +++ b/sound/pci/au88x0/au88x0_core.c @@ -1097,7 +1097,7 @@ static void vortex_adbdma_setstartbuffer(vortex_t * vortex, int adbdma, int sb) static void vortex_adbdma_setbuffers(vortex_t * vortex, int adbdma, - snd_pcm_sgbuf_t * sgbuf, int psize, int count) + struct snd_sg_buf * sgbuf, int psize, int count) { stream_t *dma = &vortex->dma_adb[adbdma]; @@ -1367,7 +1367,7 @@ static void vortex_wtdma_setstartbuffer(vortex_t * vortex, int wtdma, int sb) static void vortex_wtdma_setbuffers(vortex_t * vortex, int wtdma, - snd_pcm_sgbuf_t * sgbuf, int psize, int count) + struct snd_sg_buf * sgbuf, int psize, int count) { stream_t *dma = &vortex->dma_wt[wtdma]; @@ -2514,7 +2514,7 @@ static void vortex_codec_init(vortex_t * vortex) } static void -vortex_codec_write(ac97_t * codec, unsigned short addr, unsigned short data) +vortex_codec_write(struct snd_ac97 * codec, unsigned short addr, unsigned short data) { vortex_t *card = (vortex_t *) codec->private_data; @@ -2539,7 +2539,7 @@ vortex_codec_write(ac97_t * codec, unsigned short addr, unsigned short data) hwread(card->mmio, VORTEX_CODEC_IO); } -static unsigned short vortex_codec_read(ac97_t * codec, unsigned short addr) +static unsigned short vortex_codec_read(struct snd_ac97 * codec, unsigned short addr) { vortex_t *card = (vortex_t *) codec->private_data; |
