X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=sound%2Fparisc%2Fharmony.c;h=99f5483abf2e7efb006a01928edb3b64d0dcf886;hb=b7e23d913aafc93fc5f119e1be17620073cc3811;hp=cf603337b321d01bba027480e29fc5abbe593b98;hpb=7d12e780e003f93433d49ce78cfedf4b4c52adc5;p=mv-sheeva.git

diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c
index cf603337b32..99f5483abf2 100644
--- a/sound/parisc/harmony.c
+++ b/sound/parisc/harmony.c
@@ -45,7 +45,6 @@
 #include <linux/spinlock.h>
 #include <linux/dma-mapping.h>
 
-#include <sound/driver.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/control.h>
@@ -854,7 +853,7 @@ static struct snd_kcontrol_new snd_harmony_controls[] = {
 		       HARMONY_GAIN_HE_SHIFT, 1, 0),
 };
 
-static void __init 
+static void __devinit
 snd_harmony_mixer_reset(struct snd_harmony *h)
 {
 	harmony_mute(h);
@@ -863,7 +862,7 @@ snd_harmony_mixer_reset(struct snd_harmony *h)
 	harmony_unmute(h);
 }
 
-static int __init 
+static int __devinit
 snd_harmony_mixer_init(struct snd_harmony *h)
 {
 	struct snd_card *card = h->card;