diff -Nur linux-2.5.5-old/sound/oss/cs46xx.c linux-2.5.5/sound/oss/cs46xx.c
--- linux-2.5.5-old/sound/oss/cs46xx.c	Thu Mar  7 14:52:46 2002
+++ linux-2.5.5/sound/oss/cs46xx.c	Thu Mar  7 14:59:47 2002
@@ -5519,7 +5519,7 @@
 
 // --------------------------------------------------------------------- 
 
-static void __devinit cs46xx_remove(struct pci_dev *pci_dev)
+static void __devexit cs46xx_remove(struct pci_dev *pci_dev)
 {
 	struct cs_card *card = PCI_GET_DRIVER_DATA(pci_dev);
 	int i;
@@ -5629,7 +5629,7 @@
 	name:"cs46xx",
 	id_table:cs46xx_pci_tbl,
 	probe:cs46xx_probe,
-	remove:cs46xx_remove,
+	remove:__devexit_p(cs46xx_remove),
 	suspend:CS46XX_SUSPEND_TBL,
 	resume:CS46XX_RESUME_TBL,
 };
diff -Nur linux-2.5.5-old/sound/oss/es1370.c linux-2.5.5/sound/oss/es1370.c
--- linux-2.5.5-old/sound/oss/es1370.c	Thu Mar  7 14:52:47 2002
+++ linux-2.5.5/sound/oss/es1370.c	Thu Mar  7 15:02:07 2002
@@ -2693,7 +2693,7 @@
 	return ret;
 }
 
-static void __devinit es1370_remove(struct pci_dev *dev)
+static void __devexit es1370_remove(struct pci_dev *dev)
 {
 	struct es1370_state *s = pci_get_drvdata(dev);
 
@@ -2728,7 +2728,7 @@
 	name: "es1370",
 	id_table: id_table,
 	probe: es1370_probe,
-	remove: es1370_remove
+	remove: __devexit_p(es1370_remove)
 };
 
 static int __init init_es1370(void)
diff -Nur linux-2.5.5-old/sound/oss/es1371.c linux-2.5.5/sound/oss/es1371.c
--- linux-2.5.5-old/sound/oss/es1371.c	Thu Mar  7 14:52:47 2002
+++ linux-2.5.5/sound/oss/es1371.c	Thu Mar  7 15:02:38 2002
@@ -2982,7 +2982,7 @@
 	return res;
 }
 
-static void __devinit es1371_remove(struct pci_dev *dev)
+static void __devexit es1371_remove(struct pci_dev *dev)
 {
 	struct es1371_state *s = pci_get_drvdata(dev);
 
@@ -3023,7 +3023,7 @@
 	name: "es1371",
 	id_table: id_table,
 	probe: es1371_probe,
-	remove: es1371_remove
+	remove: __devexit_p(es1371_remove)
 };
 
 static int __init init_es1371(void)
diff -Nur linux-2.5.5-old/sound/oss/esssolo1.c linux-2.5.5/sound/oss/esssolo1.c
--- linux-2.5.5-old/sound/oss/esssolo1.c	Thu Mar  7 14:52:47 2002
+++ linux-2.5.5/sound/oss/esssolo1.c	Thu Mar  7 15:01:00 2002
@@ -2403,7 +2403,7 @@
 	return ret;
 }
 
-static void __devinit solo1_remove(struct pci_dev *dev)
+static void __devexit solo1_remove(struct pci_dev *dev)
 {
 	struct solo1_state *s = pci_get_drvdata(dev);
 	
@@ -2443,7 +2443,7 @@
 	name: "ESS Solo1",
 	id_table: id_table,
 	probe: solo1_probe,
-	remove: solo1_remove,
+	remove: __devexit_p(solo1_remove),
 	suspend: solo1_suspend,
 	resume: solo1_resume
 };
diff -Nur linux-2.5.5-old/sound/oss/ite8172.c linux-2.5.5/sound/oss/ite8172.c
--- linux-2.5.5-old/sound/oss/ite8172.c	Thu Mar  7 14:52:48 2002
+++ linux-2.5.5/sound/oss/ite8172.c	Thu Mar  7 15:09:28 2002
@@ -1897,7 +1897,7 @@
     return -1;
 }
 
-static void __devinit it8172_remove(struct pci_dev *dev)
+static void __devexit it8172_remove(struct pci_dev *dev)
 {
     struct it8172_state *s = pci_get_drvdata(dev);
 
@@ -1931,7 +1931,7 @@
     name: IT8172_MODULE_NAME,
     id_table: id_table,
     probe: it8172_probe,
-    remove: it8172_remove
+    remove: __devexit_p(it8172_remove)
 };
 
 static int __init init_it8172(void)
diff -Nur linux-2.5.5-old/sound/oss/nec_vrc5477.c linux-2.5.5/sound/oss/nec_vrc5477.c
--- linux-2.5.5-old/sound/oss/nec_vrc5477.c	Thu Mar  7 14:52:48 2002
+++ linux-2.5.5/sound/oss/nec_vrc5477.c	Thu Mar  7 15:09:57 2002
@@ -2005,7 +2005,7 @@
 	return -1;
 }
 
-static void __devinit vrc5477_ac97_remove(struct pci_dev *dev)
+static void __devexit vrc5477_ac97_remove(struct pci_dev *dev)
 {
 	struct vrc5477_ac97_state *s = pci_get_drvdata(dev);
 
@@ -2040,7 +2040,7 @@
 	name: VRC5477_AC97_MODULE_NAME,
 	id_table: id_table,
 	probe: vrc5477_ac97_probe,
-	remove: vrc5477_ac97_remove
+	remove: __devexit_p(vrc5477_ac97_remove)
 };
 
 static int __init init_vrc5477_ac97(void)
diff -Nur linux-2.5.5-old/sound/oss/nm256_audio.c linux-2.5.5/sound/oss/nm256_audio.c
--- linux-2.5.5-old/sound/oss/nm256_audio.c	Thu Mar  7 14:52:48 2002
+++ linux-2.5.5/sound/oss/nm256_audio.c	Thu Mar  7 15:08:31 2002
@@ -1266,7 +1266,7 @@
     return -1; /* should not come here ... */
 }
 
-static void __devinit
+static void __devexit
 nm256_remove(struct pci_dev *pcidev) {
     struct nm256_info *xcard = pci_get_drvdata(pcidev);
     struct nm256_info *card,*next_card = NULL;
@@ -1660,7 +1660,7 @@
 	name:"nm256_audio",
 	id_table:nm256_pci_tbl,
 	probe:nm256_probe,
-	remove:nm256_remove,
+	remove:__devexit_p(nm256_remove),
 };
 
 MODULE_PARM (usecache, "i");
diff -Nur linux-2.5.5-old/sound/oss/rme96xx.c linux-2.5.5/sound/oss/rme96xx.c
--- linux-2.5.5-old/sound/oss/rme96xx.c	Thu Mar  7 14:52:48 2002
+++ linux-2.5.5/sound/oss/rme96xx.c	Thu Mar  7 15:07:28 2002
@@ -767,7 +767,7 @@
 }
 
 
-static void __devinit rme96xx_remove(struct pci_dev *dev)
+static void __devexit rme96xx_remove(struct pci_dev *dev)
 {
 	int i;
 	rme96xx_info *s = pci_get_drvdata(dev);
@@ -816,7 +816,7 @@
 	name: "rme96xx",
 	id_table: id_table,
 	probe: rme96xx_probe,
-	remove: rme96xx_remove
+	remove: __devexit_p(rme96xx_remove)
 };
 
 static int __init init_rme96xx(void)
diff -Nur linux-2.5.5-old/sound/oss/sonicvibes.c linux-2.5.5/sound/oss/sonicvibes.c
--- linux-2.5.5-old/sound/oss/sonicvibes.c	Thu Mar  7 14:52:48 2002
+++ linux-2.5.5/sound/oss/sonicvibes.c	Thu Mar  7 15:09:01 2002
@@ -2668,7 +2668,7 @@
 	return ret;
 }
 
-static void __devinit sv_remove(struct pci_dev *dev)
+static void __devexit sv_remove(struct pci_dev *dev)
 {
 	struct sv_state *s = pci_get_drvdata(dev);
 
@@ -2710,7 +2710,7 @@
        name: "sonicvibes",
        id_table: id_table,
        probe: sv_probe,
-       remove: sv_remove
+       remove: __devexit_p(sv_remove)
 };
  
 static int __init init_sonicvibes(void)