aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/au88x0/au88x0.h13
-rw-r--r--sound/pci/au88x0/au88x0_core.c2
-rw-r--r--sound/pci/au88x0/au88x0_eq.c2
3 files changed, 8 insertions, 9 deletions
diff --git a/sound/pci/au88x0/au88x0.h b/sound/pci/au88x0/au88x0.h
index d65ccb1866a0..f078b716d2b0 100644
--- a/sound/pci/au88x0/au88x0.h
+++ b/sound/pci/au88x0/au88x0.h
@@ -19,7 +19,6 @@
19 19
20#ifdef __KERNEL__ 20#ifdef __KERNEL__
21#include <sound/driver.h> 21#include <sound/driver.h>
22#include <linux/init.h>
23#include <linux/pci.h> 22#include <linux/pci.h>
24#include <asm/io.h> 23#include <asm/io.h>
25#include <sound/core.h> 24#include <sound/core.h>
@@ -277,14 +276,14 @@ static void vortex_Vort3D_InitializeSource(a3dsrc_t * a, int en);
277#endif 276#endif
278 277
279/* Driver stuff. */ 278/* Driver stuff. */
280static int __devinit vortex_gameport_register(vortex_t * card); 279static int vortex_gameport_register(vortex_t * card);
281static void vortex_gameport_unregister(vortex_t * card); 280static void vortex_gameport_unregister(vortex_t * card);
282#ifndef CHIP_AU8820 281#ifndef CHIP_AU8820
283static int __devinit vortex_eq_init(vortex_t * vortex); 282static int vortex_eq_init(vortex_t * vortex);
284static int __devexit vortex_eq_free(vortex_t * vortex); 283static int vortex_eq_free(vortex_t * vortex);
285#endif 284#endif
286/* ALSA stuff. */ 285/* ALSA stuff. */
287static int __devinit snd_vortex_new_pcm(vortex_t * vortex, int idx, int nr); 286static int snd_vortex_new_pcm(vortex_t * vortex, int idx, int nr);
288static int __devinit snd_vortex_mixer(vortex_t * vortex); 287static int snd_vortex_mixer(vortex_t * vortex);
289static int __devinit snd_vortex_midi(vortex_t * vortex); 288static int snd_vortex_midi(vortex_t * vortex);
290#endif 289#endif
diff --git a/sound/pci/au88x0/au88x0_core.c b/sound/pci/au88x0/au88x0_core.c
index 9cac02e93b25..4347e6abc1d5 100644
--- a/sound/pci/au88x0/au88x0_core.c
+++ b/sound/pci/au88x0/au88x0_core.c
@@ -2658,7 +2658,7 @@ static void vortex_spdif_init(vortex_t * vortex, int spdif_sr, int spdif_mode)
2658 2658
2659/* Initialization */ 2659/* Initialization */
2660 2660
2661static int vortex_core_init(vortex_t * vortex) 2661static int __devinit vortex_core_init(vortex_t * vortex)
2662{ 2662{
2663 2663
2664 printk(KERN_INFO "Vortex: init.... "); 2664 printk(KERN_INFO "Vortex: init.... ");
diff --git a/sound/pci/au88x0/au88x0_eq.c b/sound/pci/au88x0/au88x0_eq.c
index 64fbfbbaf816..0c86a31c4336 100644
--- a/sound/pci/au88x0/au88x0_eq.c
+++ b/sound/pci/au88x0/au88x0_eq.c
@@ -885,7 +885,7 @@ static char *EqBandLabels[10] __devinitdata = {
885}; 885};
886 886
887/* ALSA driver entry points. Init and exit. */ 887/* ALSA driver entry points. Init and exit. */
888static int vortex_eq_init(vortex_t * vortex) 888static int __devinit vortex_eq_init(vortex_t * vortex)
889{ 889{
890 struct snd_kcontrol *kcontrol; 890 struct snd_kcontrol *kcontrol;
891 int err, i; 891 int err, i;