diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-04-17 15:35:18 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-04-17 15:35:18 +0100 |
| commit | 94171db1d2f23c22b6050d210b72db3bb2f0b81e (patch) | |
| tree | 2318d487807e9f7393fcd46ef0090a27b4ad7981 /sound/pci/au88x0/au88x0.h | |
| parent | d96fb997c6174f98a2a0a98200f99ac13b053bd6 (diff) | |
| parent | c19f7a9e1ac45b57375d51f033b02deca50f4d3f (diff) | |
| download | kernel_samsung_tuna-94171db1d2f23c22b6050d210b72db3bb2f0b81e.zip kernel_samsung_tuna-94171db1d2f23c22b6050d210b72db3bb2f0b81e.tar.gz kernel_samsung_tuna-94171db1d2f23c22b6050d210b72db3bb2f0b81e.tar.bz2 | |
Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'sound/pci/au88x0/au88x0.h')
| -rw-r--r-- | sound/pci/au88x0/au88x0.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sound/pci/au88x0/au88x0.h b/sound/pci/au88x0/au88x0.h index d65ccb1..f078b71 100644 --- a/sound/pci/au88x0/au88x0.h +++ b/sound/pci/au88x0/au88x0.h @@ -19,7 +19,6 @@ #ifdef __KERNEL__ #include <sound/driver.h> -#include <linux/init.h> #include <linux/pci.h> #include <asm/io.h> #include <sound/core.h> @@ -277,14 +276,14 @@ static void vortex_Vort3D_InitializeSource(a3dsrc_t * a, int en); #endif /* Driver stuff. */ -static int __devinit vortex_gameport_register(vortex_t * card); +static int vortex_gameport_register(vortex_t * card); static void vortex_gameport_unregister(vortex_t * card); #ifndef CHIP_AU8820 -static int __devinit vortex_eq_init(vortex_t * vortex); -static int __devexit vortex_eq_free(vortex_t * vortex); +static int vortex_eq_init(vortex_t * vortex); +static int vortex_eq_free(vortex_t * vortex); #endif /* ALSA stuff. */ -static int __devinit snd_vortex_new_pcm(vortex_t * vortex, int idx, int nr); -static int __devinit snd_vortex_mixer(vortex_t * vortex); -static int __devinit snd_vortex_midi(vortex_t * vortex); +static int snd_vortex_new_pcm(vortex_t * vortex, int idx, int nr); +static int snd_vortex_mixer(vortex_t * vortex); +static int snd_vortex_midi(vortex_t * vortex); #endif |