Index: isa/ad1816.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/isa/ad1816.c,v
retrieving revision 1.39
diff -u -r1.39 ad1816.c
--- isa/ad1816.c	21 Mar 2006 03:47:25 -0000	1.39
+++ isa/ad1816.c	18 Apr 2006 03:11:43 -0000
@@ -635,7 +635,7 @@
 		rman_get_start(ad1816->drq1),
 		status2,
 		ad1816->bufsize,
-		PCM_KLDSTRING(snd_ad1816));
+		PCM_KLDSTRING(ad1816));
 
     	if (pcm_register(dev, ad1816, 1, 1)) goto no;
     	pcm_addchan(dev, PCMDIR_REC, &ad1816chan_class, ad1816);
@@ -680,9 +680,9 @@
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_ad1816, isa, ad1816_driver, pcm_devclass, 0, 0);
-DRIVER_MODULE(snd_ad1816, acpi, ad1816_driver, pcm_devclass, 0, 0);
-MODULE_DEPEND(snd_ad1816, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_VERSION(snd_ad1816, 1);
+DRIVER_MODULE(ad1816, isa, ad1816_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(ad1816, acpi, ad1816_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(ad1816, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_VERSION(ad1816, 1);
 
 
Index: isa/es1888.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/isa/es1888.c,v
retrieving revision 1.15
diff -u -r1.15 es1888.c
--- isa/es1888.c	6 Jan 2005 01:43:17 -0000	1.15
+++ isa/es1888.c	18 Apr 2006 03:11:43 -0000
@@ -170,8 +170,8 @@
 	1,			/* no softc */
 };
 
-DRIVER_MODULE(snd_es1888, isa, es1888_driver, pcm_devclass, 0, 0);
-MODULE_DEPEND(snd_es1888, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_VERSION(snd_es1888, 1);
+DRIVER_MODULE(es1888, isa, es1888_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(es1888, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_VERSION(es1888, 1);
 
 
Index: isa/ess.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/isa/ess.c,v
retrieving revision 1.36
diff -u -r1.36 ess.c
--- isa/ess.c	16 Jan 2006 20:01:33 -0000	1.36
+++ isa/ess.c	18 Apr 2006 03:11:43 -0000
@@ -871,7 +871,7 @@
     	snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld%s bufsz %u %s",
     	     	rman_get_start(sc->io_base), rman_get_start(sc->irq),
 		rman_get_start(sc->drq1), buf, sc->bufsize,
-		PCM_KLDSTRING(snd_ess));
+		PCM_KLDSTRING(ess));
 
     	if (pcm_register(dev, sc, 1, 1))
 		goto no;
@@ -937,10 +937,10 @@
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_ess, sbc, ess_driver, pcm_devclass, 0, 0);
-MODULE_DEPEND(snd_ess, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_DEPEND(snd_ess, snd_sbc, 1, 1, 1);
-MODULE_VERSION(snd_ess, 1);
+DRIVER_MODULE(ess, sbc, ess_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(ess, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_DEPEND(ess, sbc, 1, 1, 1);
+MODULE_VERSION(ess, 1);
 
 /************************************************************/
 
Index: isa/gusc.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/isa/gusc.c,v
retrieving revision 1.16
diff -u -r1.16 gusc.c
--- isa/gusc.c	6 Jan 2005 01:43:17 -0000	1.16
+++ isa/gusc.c	18 Apr 2006 03:11:43 -0000
@@ -655,9 +655,9 @@
 /*
  * gusc can be attached to an isa bus.
  */
-DRIVER_MODULE(snd_gusc, isa, gusc_driver, gusc_devclass, 0, 0);
-DRIVER_MODULE(snd_gusc, acpi, gusc_driver, gusc_devclass, 0, 0);
-MODULE_DEPEND(snd_gusc, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_VERSION(snd_gusc, 1);
+DRIVER_MODULE(gusc, isa, gusc_driver, gusc_devclass, 0, 0);
+DRIVER_MODULE(gusc, acpi, gusc_driver, gusc_devclass, 0, 0);
+MODULE_DEPEND(gusc, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_VERSION(gusc, 1);
 
 
Index: isa/mss.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/isa/mss.c,v
retrieving revision 1.105
diff -u -r1.105 mss.c
--- isa/mss.c	5 Feb 2006 17:35:13 -0000	1.105
+++ isa/mss.c	18 Apr 2006 03:11:43 -0000
@@ -1907,9 +1907,9 @@
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_mss, isa, mss_driver, pcm_devclass, 0, 0);
-MODULE_DEPEND(snd_mss, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_VERSION(snd_mss, 1);
+DRIVER_MODULE(mss, isa, mss_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(mss, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_VERSION(mss, 1);
 
 static int
 azt2320_mss_mode(struct mss_info *mss, device_t dev)
@@ -2224,10 +2224,10 @@
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_pnpmss, isa, pnpmss_driver, pcm_devclass, 0, 0);
-DRIVER_MODULE(snd_pnpmss, acpi, pnpmss_driver, pcm_devclass, 0, 0);
-MODULE_DEPEND(snd_pnpmss, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_VERSION(snd_pnpmss, 1);
+DRIVER_MODULE(pnpmss, isa, pnpmss_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(pnpmss, acpi, pnpmss_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(pnpmss, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_VERSION(pnpmss, 1);
 
 static int
 guspcm_probe(device_t dev)
@@ -2309,8 +2309,8 @@
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_guspcm, gusc, guspcm_driver, pcm_devclass, 0, 0);
-MODULE_DEPEND(snd_guspcm, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_VERSION(snd_guspcm, 1);
+DRIVER_MODULE(guspcm, gusc, guspcm_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(guspcm, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_VERSION(guspcm, 1);
 
 
Index: isa/sb16.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/isa/sb16.c,v
retrieving revision 1.92
diff -u -r1.92 sb16.c
--- isa/sb16.c	14 Nov 2005 18:16:59 -0000	1.92
+++ isa/sb16.c	18 Apr 2006 03:11:43 -0000
@@ -861,7 +861,7 @@
     	snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld%s bufsz %u %s",
     	     	rman_get_start(sb->io_base), rman_get_start(sb->irq),
 		rman_get_start(sb->drq1), status2, sb->bufsize,
-		PCM_KLDSTRING(snd_sb16));
+		PCM_KLDSTRING(sb16));
 
     	if (pcm_register(dev, sb, 1, 1))
 		goto no;
@@ -907,7 +907,7 @@
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_sb16, sbc, sb16_driver, pcm_devclass, 0, 0);
-MODULE_DEPEND(snd_sb16, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_DEPEND(snd_sb16, snd_sbc, 1, 1, 1);
-MODULE_VERSION(snd_sb16, 1);
+DRIVER_MODULE(sb16, sbc, sb16_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(sb16, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_DEPEND(sb16, sbc, 1, 1, 1);
+MODULE_VERSION(sb16, 1);
Index: isa/sb8.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/isa/sb8.c,v
retrieving revision 1.81
diff -u -r1.81 sb8.c
--- isa/sb8.c	31 Jul 2005 18:59:47 -0000	1.81
+++ isa/sb8.c	18 Apr 2006 03:11:43 -0000
@@ -749,7 +749,7 @@
 
     	snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld bufsz %u %s",
     	     	rman_get_start(sb->io_base), rman_get_start(sb->irq),
-		rman_get_start(sb->drq), sb->bufsize, PCM_KLDSTRING(snd_sb8));
+		rman_get_start(sb->drq), sb->bufsize, PCM_KLDSTRING(sb8));
 
     	if (pcm_register(dev, sb, 1, 1))
 		goto no;
@@ -795,10 +795,10 @@
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_sb8, sbc, sb_driver, pcm_devclass, 0, 0);
-MODULE_DEPEND(snd_sb8, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_DEPEND(snd_sb8, snd_sbc, 1, 1, 1);
-MODULE_VERSION(snd_sb8, 1);
+DRIVER_MODULE(sb8, sbc, sb_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(sb8, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_DEPEND(sb8, sbc, 1, 1, 1);
+MODULE_VERSION(sb8, 1);
 
 
 
Index: isa/sbc.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/isa/sbc.c,v
retrieving revision 1.45
diff -u -r1.45 sbc.c
--- isa/sbc.c	31 Jul 2005 13:49:47 -0000	1.45
+++ isa/sbc.c	18 Apr 2006 03:11:43 -0000
@@ -790,7 +790,7 @@
 };
 
 /* sbc can be attached to an isa bus. */
-DRIVER_MODULE(snd_sbc, isa, sbc_driver, sbc_devclass, 0, 0);
-DRIVER_MODULE(snd_sbc, acpi, sbc_driver, sbc_devclass, 0, 0);
-MODULE_DEPEND(snd_sbc, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_VERSION(snd_sbc, 1);
+DRIVER_MODULE(sbc, isa, sbc_driver, sbc_devclass, 0, 0);
+DRIVER_MODULE(sbc, acpi, sbc_driver, sbc_devclass, 0, 0);
+MODULE_DEPEND(sbc, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_VERSION(sbc, 1);
Index: pci/als4000.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/pci/als4000.c,v
retrieving revision 1.22
diff -u -r1.22 als4000.c
--- pci/als4000.c	7 Nov 2005 09:26:17 -0000	1.22
+++ pci/als4000.c	18 Apr 2006 03:11:43 -0000
@@ -855,7 +855,7 @@
 	pcm_addchan(dev, PCMDIR_REC,  &alsrchan_class, sc);
 
 	snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld %s",
-		 rman_get_start(sc->reg), rman_get_start(sc->irq),PCM_KLDSTRING(snd_als4000));
+		 rman_get_start(sc->reg), rman_get_start(sc->irq),PCM_KLDSTRING(als4000));
 	pcm_setstatus(dev, status);
 	return 0;
 
@@ -942,6 +942,6 @@
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_als4000, pci, als_driver, pcm_devclass, 0, 0);
-MODULE_DEPEND(snd_als4000, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_VERSION(snd_als4000, 1);
+DRIVER_MODULE(als4000, pci, als_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(als4000, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_VERSION(als4000, 1);
Index: pci/atiixp.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/pci/atiixp.c,v
retrieving revision 1.6
diff -u -r1.6 atiixp.c
--- pci/atiixp.c	22 Mar 2006 21:29:47 -0000	1.6
+++ pci/atiixp.c	18 Apr 2006 03:11:43 -0000
@@ -816,7 +816,7 @@
 
 	snprintf(status, SND_STATUSLEN, "at memory 0x%lx irq %ld %s", 
 			rman_get_start(sc->reg), rman_get_start(sc->irq),
-			PCM_KLDSTRING(snd_atiixp));
+			PCM_KLDSTRING(atiixp));
 
 	pcm_setstatus(sc->dev, status);
 
@@ -1125,6 +1125,6 @@
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_atiixp, pci, atiixp_driver, pcm_devclass, 0, 0);
-MODULE_DEPEND(snd_atiixp, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_VERSION(snd_atiixp, 1);
+DRIVER_MODULE(atiixp, pci, atiixp_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(atiixp, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_VERSION(atiixp, 1);
Index: pci/au88x0.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/pci/au88x0.c,v
retrieving revision 1.10
diff -u -r1.10 au88x0.c
--- pci/au88x0.c	1 Mar 2005 08:58:05 -0000	1.10
+++ pci/au88x0.c	18 Apr 2006 03:11:43 -0000
@@ -531,7 +531,7 @@
 	aui = pcm_getdevinfo(dev);
 	snprintf(status, sizeof status, "at %s 0x%lx irq %ld %s",
 	    (aui->aui_regtype == SYS_RES_IOPORT)? "io" : "memory",
-	    rman_get_start(aui->aui_reg), rman_get_start(aui->aui_irq),PCM_KLDSTRING(snd_au88x0));
+	    rman_get_start(aui->aui_reg), rman_get_start(aui->aui_irq),PCM_KLDSTRING(au88x0));
 	pcm_setstatus(dev, status);
 }
 
@@ -728,6 +728,6 @@
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_au88x0, pci, au88x0_driver, pcm_devclass, 0, 0);
-MODULE_DEPEND(snd_au88x0, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_VERSION(snd_au88x0, 1);
+DRIVER_MODULE(au88x0, pci, au88x0_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(au88x0, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_VERSION(au88x0, 1);
Index: pci/aureal.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/pci/aureal.c,v
retrieving revision 1.32
diff -u -r1.32 aureal.c
--- pci/aureal.c	1 Mar 2005 08:58:05 -0000	1.32
+++ pci/aureal.c	18 Apr 2006 03:11:43 -0000
@@ -650,7 +650,7 @@
 
 	snprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld %s",
 		 (type[0] == SYS_RES_IOPORT)? "io" : "memory",
-		 rman_get_start(reg[0]), rman_get_start(irq),PCM_KLDSTRING(snd_aureal));
+		 rman_get_start(reg[0]), rman_get_start(irq),PCM_KLDSTRING(aureal));
 
 	if (pcm_register(dev, au, 1, 1)) goto bad;
 	/* pcm_addchan(dev, PCMDIR_REC, &au_chantemplate, au); */
@@ -682,6 +682,6 @@
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_aureal, pci, au_driver, pcm_devclass, 0, 0);
-MODULE_DEPEND(snd_aureal, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_VERSION(snd_aureal, 1);
+DRIVER_MODULE(aureal, pci, au_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(aureal, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_VERSION(aureal, 1);
Index: pci/cmi.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/pci/cmi.c,v
retrieving revision 1.34
diff -u -r1.34 cmi.c
--- pci/cmi.c	21 Jan 2006 09:05:12 -0000	1.34
+++ pci/cmi.c	18 Apr 2006 03:11:43 -0000
@@ -897,7 +897,7 @@
 	pcm_addchan(dev, PCMDIR_REC, &cmichan_class, sc);
 
 	snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld %s",
-		 rman_get_start(sc->reg), rman_get_start(sc->irq),PCM_KLDSTRING(snd_cmi));
+		 rman_get_start(sc->reg), rman_get_start(sc->irq),PCM_KLDSTRING(cmi));
 	pcm_setstatus(dev, status);
 
 	DEB(printf("cmi_attach: succeeded\n"));
@@ -1005,6 +1005,6 @@
 	PCM_SOFTC_SIZE
 };
 
-DRIVER_MODULE(snd_cmi, pci, cmi_driver, pcm_devclass, 0, 0);
-MODULE_DEPEND(snd_cmi, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_VERSION(snd_cmi, 1);
+DRIVER_MODULE(cmi, pci, cmi_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(cmi, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_VERSION(cmi, 1);
Index: pci/cs4281.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/pci/cs4281.c,v
retrieving revision 1.22
diff -u -r1.22 cs4281.c
--- pci/cs4281.c	1 Mar 2005 08:58:05 -0000	1.22
+++ pci/cs4281.c	18 Apr 2006 03:11:43 -0000
@@ -860,7 +860,7 @@
 
     snprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld %s",
 	     (sc->regtype == SYS_RES_IOPORT)? "io" : "memory",
-	     rman_get_start(sc->reg), rman_get_start(sc->irq),PCM_KLDSTRING(snd_cs4281));
+	     rman_get_start(sc->reg), rman_get_start(sc->irq),PCM_KLDSTRING(cs4281));
     pcm_setstatus(dev, status);
 
     return 0;
@@ -975,6 +975,6 @@
     PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_cs4281, pci, cs4281_driver, pcm_devclass, 0, 0);
-MODULE_DEPEND(snd_cs4281, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_VERSION(snd_cs4281, 1);
+DRIVER_MODULE(cs4281, pci, cs4281_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(cs4281, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_VERSION(cs4281, 1);
Index: pci/csa.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/pci/csa.c,v
retrieving revision 1.34
diff -u -r1.34 csa.c
--- pci/csa.c	4 Dec 2005 10:06:04 -0000	1.34
+++ pci/csa.c	18 Apr 2006 03:11:43 -0000
@@ -1071,6 +1071,6 @@
 /*
  * csa can be attached to a pci bus.
  */
-DRIVER_MODULE(snd_csa, pci, csa_driver, csa_devclass, 0, 0);
-MODULE_DEPEND(snd_csa, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_VERSION(snd_csa, 1);
+DRIVER_MODULE(csa, pci, csa_driver, csa_devclass, 0, 0);
+MODULE_DEPEND(csa, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_VERSION(csa, 1);
Index: pci/csapcm.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/pci/csapcm.c,v
retrieving revision 1.37
diff -u -r1.37 csapcm.c
--- pci/csapcm.c	5 Feb 2006 17:34:13 -0000	1.37
+++ pci/csapcm.c	18 Apr 2006 03:11:43 -0000
@@ -819,7 +819,7 @@
 	}
 
 	snprintf(status, SND_STATUSLEN, "at irq %ld %s",
-			rman_get_start(resp->irq),PCM_KLDSTRING(snd_csa));
+			rman_get_start(resp->irq),PCM_KLDSTRING(csa));
 
 	/* Enable interrupt. */
 	if (snd_setup_intr(dev, resp->irq, 0, csa_intr, csa, &csa->ih)) {
@@ -1032,7 +1032,7 @@
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_csapcm, csa, pcmcsa_driver, pcm_devclass, 0, 0);
-MODULE_DEPEND(snd_csapcm, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_DEPEND(snd_csapcm, snd_csa, 1, 1, 1);
-MODULE_VERSION(snd_csapcm, 1);
+DRIVER_MODULE(csapcm, csa, pcmcsa_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(csapcm, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_DEPEND(csapcm, csa, 1, 1, 1);
+MODULE_VERSION(csapcm, 1);
Index: pci/ds1.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/pci/ds1.c,v
retrieving revision 1.45
diff -u -r1.45 ds1.c
--- pci/ds1.c	18 Jan 2006 01:01:37 -0000	1.45
+++ pci/ds1.c	18 Apr 2006 03:11:43 -0000
@@ -1012,7 +1012,7 @@
 	}
 
 	snprintf(status, SND_STATUSLEN, "at memory 0x%lx irq %ld %s",
-		 rman_get_start(sc->reg), rman_get_start(sc->irq),PCM_KLDSTRING(snd_ds1));
+		 rman_get_start(sc->reg), rman_get_start(sc->irq),PCM_KLDSTRING(ds1));
 
 	if (pcm_register(dev, sc, DS1_CHANS, 2))
 		goto bad;
@@ -1098,6 +1098,6 @@
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_ds1, pci, ds1_driver, pcm_devclass, 0, 0);
-MODULE_DEPEND(snd_ds1, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_VERSION(snd_ds1, 1);
+DRIVER_MODULE(ds1, pci, ds1_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(ds1, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_VERSION(ds1, 1);
Index: pci/emu10k1.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/pci/emu10k1.c,v
retrieving revision 1.58
diff -u -r1.58 emu10k1.c
--- pci/emu10k1.c	21 Jan 2006 16:21:06 -0000	1.58
+++ pci/emu10k1.c	18 Apr 2006 03:11:43 -0000
@@ -1974,7 +1974,7 @@
 
 	snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld %s",
 	    rman_get_start(sc->reg), rman_get_start(sc->irq),
-	    PCM_KLDSTRING(snd_emu10k1));
+	    PCM_KLDSTRING(emu10k1));
 
 	if (pcm_register(dev, sc, sc->nchans, gotmic ? 3 : 2)) goto bad;
 	for (i = 0; i < sc->nchans; i++)
@@ -2037,10 +2037,10 @@
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_emu10k1, pci, emu_driver, pcm_devclass, 0, 0);
-DRIVER_MODULE(snd_emu10k1, cardbus, emu_driver, pcm_devclass, 0, 0);
-MODULE_DEPEND(snd_emu10k1, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_VERSION(snd_emu10k1, 1);
+DRIVER_MODULE(emu10k1, pci, emu_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(emu10k1, cardbus, emu_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(emu10k1, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_VERSION(emu10k1, 1);
 
 /* dummy driver to silence the joystick device */
 static int
Index: pci/es137x.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/pci/es137x.c,v
retrieving revision 1.59
diff -u -r1.59 es137x.c
--- pci/es137x.c	13 Jan 2006 04:54:34 -0000	1.59
+++ pci/es137x.c	18 Apr 2006 03:11:43 -0000
@@ -1541,7 +1541,7 @@
 
 	snprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld %s",
 		 (es->regtype == SYS_RES_IOPORT)? "io" : "memory",
-		 rman_get_start(es->reg), rman_get_start(es->irq),PCM_KLDSTRING(snd_es137x));
+		 rman_get_start(es->reg), rman_get_start(es->irq),PCM_KLDSTRING(es137x));
 
 	if (pcm_register(dev, es, numplay, 1))
 		goto bad;
@@ -1607,6 +1607,6 @@
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_es137x, pci, es_driver, pcm_devclass, 0, 0);
-MODULE_DEPEND(snd_es137x, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_VERSION(snd_es137x, 1);
+DRIVER_MODULE(es137x, pci, es_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(es137x, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_VERSION(es137x, 1);
Index: pci/fm801.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/pci/fm801.c,v
retrieving revision 1.28
diff -u -r1.28 fm801.c
--- pci/fm801.c	9 Jan 2006 06:05:25 -0000	1.28
+++ pci/fm801.c	18 Apr 2006 03:11:43 -0000
@@ -643,7 +643,7 @@
 
 	snprintf(status, 64, "at %s 0x%lx irq %ld %s",
 		(fm801->regtype == SYS_RES_IOPORT)? "io" : "memory",
-		rman_get_start(fm801->reg), rman_get_start(fm801->irq),PCM_KLDSTRING(snd_fm801));
+		rman_get_start(fm801->reg), rman_get_start(fm801->irq),PCM_KLDSTRING(fm801));
 
 #define FM801_MAXPLAYCH	1
 	if (pcm_register(dev, fm801, FM801_MAXPLAYCH, 1)) goto oops;
@@ -761,6 +761,6 @@
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_fm801, pci, fm801_driver, pcm_devclass, 0, 0);
-MODULE_DEPEND(snd_fm801, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_VERSION(snd_fm801, 1);
+DRIVER_MODULE(fm801, pci, fm801_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(fm801, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_VERSION(fm801, 1);
Index: pci/ich.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/pci/ich.c,v
retrieving revision 1.64
diff -u -r1.64 ich.c
--- pci/ich.c	3 Apr 2006 17:37:27 -0000	1.64
+++ pci/ich.c	18 Apr 2006 03:11:43 -0000
@@ -873,7 +873,7 @@
 		pcm_addchan(dev, PCMDIR_REC, &ichchan_class, sc);	/* record mic */
 
 	snprintf(status, SND_STATUSLEN, "at io 0x%lx, 0x%lx irq %ld bufsz %u %s",
-		 rman_get_start(sc->nambar), rman_get_start(sc->nabmbar), rman_get_start(sc->irq), sc->bufsz,PCM_KLDSTRING(snd_ich));
+		 rman_get_start(sc->nambar), rman_get_start(sc->nabmbar), rman_get_start(sc->irq), sc->bufsz,PCM_KLDSTRING(ich));
 
 	pcm_setstatus(dev, status);
 
@@ -1034,6 +1034,6 @@
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_ich, pci, ich_driver, pcm_devclass, 0, 0);
-MODULE_DEPEND(snd_ich, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_VERSION(snd_ich, 1);
+DRIVER_MODULE(ich, pci, ich_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(ich, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_VERSION(ich, 1);
Index: pci/maestro.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/pci/maestro.c,v
retrieving revision 1.31
diff -u -r1.31 maestro.c
--- pci/maestro.c	21 Jan 2006 11:50:56 -0000	1.31
+++ pci/maestro.c	18 Apr 2006 03:11:43 -0000
@@ -2070,6 +2070,6 @@
 
 /*static devclass_t pcm_devclass;*/
 
-DRIVER_MODULE(snd_maestro, pci, agg_driver, pcm_devclass, 0, 0);
-MODULE_DEPEND(snd_maestro, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_VERSION(snd_maestro, 1);
+DRIVER_MODULE(maestro, pci, agg_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(maestro, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_VERSION(maestro, 1);
Index: pci/maestro3.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/pci/maestro3.c,v
retrieving revision 1.29
diff -u -r1.29 maestro3.c
--- pci/maestro3.c	13 Sep 2005 10:12:28 -0000	1.29
+++ pci/maestro3.c	18 Apr 2006 03:11:43 -0000
@@ -1298,7 +1298,7 @@
  	snprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld %s",
 	    (sc->regtype == SYS_RES_IOPORT)? "io" : "memory",
 	    rman_get_start(sc->reg), rman_get_start(sc->irq),
-	    PCM_KLDSTRING(snd_maestro3));
+	    PCM_KLDSTRING(maestro3));
 	if (pcm_setstatus(dev, status)) {
 		device_printf(dev, "attach: pcm_setstatus error\n");
 		goto bad;
@@ -1652,6 +1652,6 @@
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_maestro3, pci, m3_driver, pcm_devclass, 0, 0);
-MODULE_DEPEND(snd_maestro3, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_VERSION(snd_maestro3, 1);
+DRIVER_MODULE(maestro3, pci, m3_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(maestro3, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_VERSION(maestro3, 1);
Index: pci/neomagic.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/pci/neomagic.c,v
retrieving revision 1.35
diff -u -r1.35 neomagic.c
--- pci/neomagic.c	11 Sep 2005 17:30:27 -0000	1.35
+++ pci/neomagic.c	18 Apr 2006 03:11:43 -0000
@@ -715,7 +715,7 @@
 
 	snprintf(status, SND_STATUSLEN, "at memory 0x%lx, 0x%lx irq %ld %s",
 		 rman_get_start(sc->buf), rman_get_start(sc->reg),
-		 rman_get_start(sc->irq),PCM_KLDSTRING(snd_neomagic));
+		 rman_get_start(sc->irq),PCM_KLDSTRING(neomagic));
 
 	if (pcm_register(dev, sc, 1, 1)) goto bad;
 	pcm_addchan(dev, PCMDIR_REC, &nmchan_class, sc);
@@ -826,6 +826,6 @@
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_neomagic, pci, nm_driver, pcm_devclass, 0, 0);
-MODULE_DEPEND(snd_neomagic, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_VERSION(snd_neomagic, 1);
+DRIVER_MODULE(neomagic, pci, nm_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(neomagic, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_VERSION(neomagic, 1);
Index: pci/solo.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/pci/solo.c,v
retrieving revision 1.38
diff -u -r1.38 solo.c
--- pci/solo.c	27 Jan 2006 02:01:27 -0000	1.38
+++ pci/solo.c	18 Apr 2006 03:11:43 -0000
@@ -1058,7 +1058,7 @@
 
     	snprintf(status, SND_STATUSLEN, "at io 0x%lx,0x%lx,0x%lx irq %ld %s",
     	     	rman_get_start(sc->io), rman_get_start(sc->sb), rman_get_start(sc->vc),
-		rman_get_start(sc->irq),PCM_KLDSTRING(snd_solo));
+		rman_get_start(sc->irq),PCM_KLDSTRING(solo));
 
     	if (pcm_register(dev, sc, 1, 1))
 		goto no;
@@ -1105,9 +1105,9 @@
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_solo, pci, ess_driver, pcm_devclass, 0, 0);
-MODULE_DEPEND(snd_solo, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_VERSION(snd_solo, 1);
+DRIVER_MODULE(solo, pci, ess_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(solo, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_VERSION(solo, 1);
 
 
 
Index: pci/t4dwave.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/pci/t4dwave.c,v
retrieving revision 1.48
diff -u -r1.48 t4dwave.c
--- pci/t4dwave.c	1 Mar 2005 08:58:05 -0000	1.48
+++ pci/t4dwave.c	18 Apr 2006 03:11:43 -0000
@@ -872,7 +872,7 @@
 	}
 
 	snprintf(status, 64, "at io 0x%lx irq %ld %s",
-		 rman_get_start(tr->reg), rman_get_start(tr->irq),PCM_KLDSTRING(snd_t4dwave));
+		 rman_get_start(tr->reg), rman_get_start(tr->irq),PCM_KLDSTRING(t4dwave));
 
 	if (pcm_register(dev, tr, TR_MAXPLAYCH, 1)) goto bad;
 	pcm_addchan(dev, PCMDIR_REC, &trrchan_class, tr);
@@ -984,6 +984,6 @@
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_t4dwave, pci, tr_driver, pcm_devclass, 0, 0);
-MODULE_DEPEND(snd_t4dwave, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_VERSION(snd_t4dwave, 1);
+DRIVER_MODULE(t4dwave, pci, tr_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(t4dwave, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_VERSION(t4dwave, 1);
Index: pci/via8233.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/pci/via8233.c,v
retrieving revision 1.23
diff -u -r1.23 via8233.c
--- pci/via8233.c	14 Nov 2005 18:18:52 -0000	1.23
+++ pci/via8233.c	18 Apr 2006 03:11:43 -0000
@@ -931,7 +931,7 @@
 	}
 
 	snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld %s", 
-		 rman_get_start(via->reg), rman_get_start(via->irq),PCM_KLDSTRING(snd_via8233));
+		 rman_get_start(via->reg), rman_get_start(via->irq),PCM_KLDSTRING(via8233));
 
 	/*
 	 * Decide whether DXS had to be disabled or not
@@ -1050,6 +1050,6 @@
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_via8233, pci, via_driver, pcm_devclass, 0, 0);
-MODULE_DEPEND(snd_via8233, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_VERSION(snd_via8233, 1);
+DRIVER_MODULE(via8233, pci, via_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(via8233, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_VERSION(via8233, 1);
Index: pci/via82c686.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/pci/via82c686.c,v
retrieving revision 1.37
diff -u -r1.37 via82c686.c
--- pci/via82c686.c	5 Oct 2005 20:05:52 -0000	1.37
+++ pci/via82c686.c	18 Apr 2006 03:11:43 -0000
@@ -592,7 +592,7 @@
 
 	snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld %s",
 		 rman_get_start(via->reg), rman_get_start(via->irq),
-		 PCM_KLDSTRING(snd_via82c686));
+		 PCM_KLDSTRING(via82c686));
 
 	/* Register */
 	if (pcm_register(dev, via, 1, 1)) goto bad;
@@ -649,6 +649,6 @@
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_via82c686, pci, via_driver, pcm_devclass, 0, 0);
-MODULE_DEPEND(snd_via82c686, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_VERSION(snd_via82c686, 1);
+DRIVER_MODULE(via82c686, pci, via_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(via82c686, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_VERSION(via82c686, 1);
Index: pci/vibes.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/pci/vibes.c,v
retrieving revision 1.20
diff -u -r1.20 vibes.c
--- pci/vibes.c	21 Jan 2006 09:05:13 -0000	1.20
+++ pci/vibes.c	18 Apr 2006 03:11:43 -0000
@@ -877,7 +877,7 @@
         pcm_addchan(dev, PCMDIR_REC,  &svrchan_class, sc);
 
         snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld %s",
-                 rman_get_start(sc->enh_reg),  rman_get_start(sc->irq),PCM_KLDSTRING(snd_vibes));
+                 rman_get_start(sc->enh_reg),  rman_get_start(sc->irq),PCM_KLDSTRING(vibes));
         pcm_setstatus(dev, status);
 
         DEB(printf("sv_attach: succeeded\n"));
@@ -939,6 +939,6 @@
         PCM_SOFTC_SIZE
 };
 
-DRIVER_MODULE(snd_vibes, pci, sonicvibes_driver, pcm_devclass, 0, 0);
-MODULE_DEPEND(snd_vibes, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_VERSION(snd_vibes, 1);
+DRIVER_MODULE(vibes, pci, sonicvibes_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(vibes, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_VERSION(vibes, 1);
Index: sbus/cs4231.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/sbus/cs4231.c,v
retrieving revision 1.4
diff -u -r1.4 cs4231.c
--- sbus/cs4231.c	19 May 2005 18:13:49 -0000	1.4
+++ sbus/cs4231.c	18 Apr 2006 03:11:43 -0000
@@ -236,7 +236,7 @@
 	PCM_SOFTC_SIZE
 };
 
-DRIVER_MODULE(snd_audiocs, sbus, cs4231_sbus_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(audiocs, sbus, cs4231_sbus_driver, pcm_devclass, 0, 0);
 
 /* EBus */
 static device_method_t cs4231_ebus_methods[] = {
@@ -254,9 +254,9 @@
 	PCM_SOFTC_SIZE
 };
 
-DRIVER_MODULE(snd_audiocs, ebus, cs4231_ebus_driver, pcm_devclass, 0, 0);
-MODULE_DEPEND(snd_audiocs, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
-MODULE_VERSION(snd_audiocs, 1);
+DRIVER_MODULE(audiocs, ebus, cs4231_ebus_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(audiocs, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_VERSION(audiocs, 1);
 
 
 static u_int32_t cs4231_fmt[] = {