From 731056356c6fb90c65cc85bcc6573417ccc1141c Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Thu, 4 Jun 2009 10:46:43 +0200
Subject: [PATCH] --- yaml --- r: 148501 b: refs/heads/master c:
 82ced6fd28653ab456c3e5b25e9ef3c1c96cd6e9 h: refs/heads/master i:   148499:
 97e0aa402854ceebc7c75734fa1ace343c31a545 v: v3

---
 [refs]                           | 2 +-
 trunk/sound/isa/es1688/es1688.c  | 2 +-
 trunk/sound/isa/gus/gusextreme.c | 2 +-
 trunk/sound/parisc/harmony.c     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 608f470c8308..1104d37da205 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e1e0a5dd539f83438078759c8642c5dd7c24cb6
+refs/heads/master: 82ced6fd28653ab456c3e5b25e9ef3c1c96cd6e9
diff --git a/trunk/sound/isa/es1688/es1688.c b/trunk/sound/isa/es1688/es1688.c
index 442b081cafb7..07df201ed8fa 100644
--- a/trunk/sound/isa/es1688/es1688.c
+++ b/trunk/sound/isa/es1688/es1688.c
@@ -193,7 +193,7 @@ static int __devexit snd_es1688_remove(struct device *dev, unsigned int n)
 static struct isa_driver snd_es1688_driver = {
 	.match		= snd_es1688_match,
 	.probe		= snd_es1688_probe,
-	.remove		= snd_es1688_remove,
+	.remove		= __devexit_p(snd_es1688_remove),
 #if 0	/* FIXME */
 	.suspend	= snd_es1688_suspend,
 	.resume		= snd_es1688_resume,
diff --git a/trunk/sound/isa/gus/gusextreme.c b/trunk/sound/isa/gus/gusextreme.c
index 180a8dea6bd9..65e4b18581a6 100644
--- a/trunk/sound/isa/gus/gusextreme.c
+++ b/trunk/sound/isa/gus/gusextreme.c
@@ -348,7 +348,7 @@ static int __devexit snd_gusextreme_remove(struct device *dev, unsigned int n)
 static struct isa_driver snd_gusextreme_driver = {
 	.match		= snd_gusextreme_match,
 	.probe		= snd_gusextreme_probe,
-	.remove		= snd_gusextreme_remove,
+	.remove		= __devexit_p(snd_gusextreme_remove),
 #if 0	/* FIXME */
 	.suspend	= snd_gusextreme_suspend,
 	.resume		= snd_gusextreme_resume,
diff --git a/trunk/sound/parisc/harmony.c b/trunk/sound/parisc/harmony.c
index 6055fd6d3b38..610c43914cf2 100644
--- a/trunk/sound/parisc/harmony.c
+++ b/trunk/sound/parisc/harmony.c
@@ -1020,7 +1020,7 @@ static struct parisc_driver snd_harmony_driver = {
 	.name = "harmony",
 	.id_table = snd_harmony_devtable,
 	.probe = snd_harmony_probe,
-	.remove = snd_harmony_remove,
+	.remove = __devexit_p(snd_harmony_remove),
 };
 
 static int __init