diff --git a/[refs] b/[refs]
index f4f53ae4953b..98dc84466406 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5dd250728aa4cad49cfa18eb8ed11ba470ce382a
+refs/heads/master: 59b1f084abd8690ffe68c67758ad08bbcb7d1af0
diff --git a/trunk/sound/isa/opti9xx/opti92x-ad1848.c b/trunk/sound/isa/opti9xx/opti92x-ad1848.c
index d7ce0125dcf2..f8fbe22515c9 100644
--- a/trunk/sound/isa/opti9xx/opti92x-ad1848.c
+++ b/trunk/sound/isa/opti9xx/opti92x-ad1848.c
@@ -348,7 +348,7 @@ static void snd_opti9xx_write(struct snd_opti9xx *chip, unsigned char reg,
 		(snd_opti9xx_read(chip, reg) & ~(mask)) | ((value) & (mask)))
 
 
-static int __devinit snd_opti9xx_configure(struct snd_opti9xx *chip,
+static int snd_opti9xx_configure(struct snd_opti9xx *chip,
 					   long port,
 					   int irq, int dma1, int dma2,
 					   long mpu_port, int mpu_irq)