From 82f9aecc2f8887d02f8e44231a61f8fcad190395 Mon Sep 17 00:00:00 2001
From: Dale Sedivec <dale@codefu.org>
Date: Mon, 10 Apr 2006 11:34:44 +0200
Subject: [PATCH] --- yaml --- r: 25663 b: refs/heads/master c:
 99e80e4d0c7755d688e9db205016a0608fa989b4 h: refs/heads/master i:   25661:
 f66ac53b33bf95eac9f82f0e9c788f9704e4c55d   25659:
 2b45cfb5666f649c16ad37a389c5954670e5b9f1   25655:
 955802c1ce509687a3d8d8c1c3d318816b8a54d4   25647:
 b6923252b6a66a4ab6dda16e7d0c8b3dbfacaf58   25631:
 c51b14b5548a77ec6cb67046eba7b03b6bf44540   25599:
 e77db04c33e00d37243d60d2e82633e3bb5331ed v: v3

---
 [refs]                               |  2 +-
 trunk/sound/pci/au88x0/au88x0.h      | 13 ++++++-------
 trunk/sound/pci/au88x0/au88x0_core.c |  2 +-
 trunk/sound/pci/au88x0/au88x0_eq.c   |  2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 6816815ae78f..3fb6945b1a75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a29b6c8895edbd9921837b592bcd125cee64fc84
+refs/heads/master: 99e80e4d0c7755d688e9db205016a0608fa989b4
diff --git a/trunk/sound/pci/au88x0/au88x0.h b/trunk/sound/pci/au88x0/au88x0.h
index d65ccb1866a0..f078b716d2b0 100644
--- a/trunk/sound/pci/au88x0/au88x0.h
+++ b/trunk/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
diff --git a/trunk/sound/pci/au88x0/au88x0_core.c b/trunk/sound/pci/au88x0/au88x0_core.c
index 9cac02e93b25..4347e6abc1d5 100644
--- a/trunk/sound/pci/au88x0/au88x0_core.c
+++ b/trunk/sound/pci/au88x0/au88x0_core.c
@@ -2658,7 +2658,7 @@ static void vortex_spdif_init(vortex_t * vortex, int spdif_sr, int spdif_mode)
 
 /* Initialization */
 
-static int vortex_core_init(vortex_t * vortex)
+static int __devinit vortex_core_init(vortex_t * vortex)
 {
 
 	printk(KERN_INFO "Vortex: init.... ");
diff --git a/trunk/sound/pci/au88x0/au88x0_eq.c b/trunk/sound/pci/au88x0/au88x0_eq.c
index 64fbfbbaf816..0c86a31c4336 100644
--- a/trunk/sound/pci/au88x0/au88x0_eq.c
+++ b/trunk/sound/pci/au88x0/au88x0_eq.c
@@ -885,7 +885,7 @@ static char *EqBandLabels[10] __devinitdata = {
 };
 
 /* ALSA driver entry points. Init and exit. */
-static int vortex_eq_init(vortex_t * vortex)
+static int __devinit vortex_eq_init(vortex_t * vortex)
 {
 	struct snd_kcontrol *kcontrol;
 	int err, i;