1999-05-14 Roland McGrath <roland@baalperazim.frob.com>

	* i386/linux/Drivers.in (linux_DRIVER): New macro, does AC_DRIVER and
	defines alias for Linux module name.  Use that for all single-module
	Linux drivers, so we don't forget to define any of the aliases for the
	Linux module names.
	* i386/linux/configure: Regenerated.

1 files changed, 69 insertions, 67 deletions

diff --git a/i386/linux/Drivers.in b/i386/linux/Drivers.in
index 5254cfc..5e79064 100644
--- a/i386/linux/Drivers.in
+++ b/i386/linux/Drivers.in
@@ -77,6 +77,7 @@ AC_DRIVER_ALIAS(de500, de4x5)
 AC_DRIVER_ALIAS(3c507, el16)
 AC_DRIVER_ALIAS(3c505, elplus)
 AC_DRIVER_ALIAS(ne1000, ne2000)
+AC_DRIVER_ALIAS(ne, ne2000)
 AC_DRIVER_ALIAS(at1500, lance)
 AC_DRIVER_ALIAS(ne2100, lance)
 AC_DRIVER_ALIAS(tulip, elcp)
@@ -104,6 +105,11 @@ dnl not possible to built a useful kernel without at least one Linux
 dnl driver, so that's not really necessary.
 
 
+dnl
+dnl linux_DRIVER(machname, MACRO, linuxname, class)
+dnl
+AC_DEFUN([linux_DRIVER],[AC_DRIVER_ALIAS($3, $1)
+AC_DRIVER($1, CONFIG_$2, $3.o, $4)])dnl
 
 dnl non-SCSI Disk controllers
 
@@ -113,37 +119,35 @@ AC_DRIVER(ide, CONFIG_BLK_DEV_IDE, cmd640.o ide-cd.o ide.o rz1000.o triton.o)
 
 dnl SCSI Disk controllers
 
-AC_DRIVER(advansys, CONFIG_SCSI_ADVANSYS, advansys.o, scsi)
-AC_DRIVER(buslogic, CONFIG_SCSI_BUSLOGIC, BusLogic.o, scsi)
-AC_DRIVER(u1434f, CONFIG_SCSI_U14_34F, u14-34f.o, scsi)
-AC_DRIVER(ultrastor, CONFIG_SCSI_ULTRASTOR, ultrastor.o, scsi)
-AC_DRIVER(aha152x, CONFIG_SCSI_AHA152X, aha152x.o, scsi)
-AC_DRIVER(aha1542, CONFIG_SCSI_AHA1542, aha1542.o, scsi)
-AC_DRIVER(aha1740, CONFIG_SCSI_AHA1740, aha1740.o, scsi)
-AC_DRIVER(aic7xxx, CONFIG_SCSI_AIC7XXX, aic7xxx.o, scsi)
-AC_DRIVER(futuredomain, CONFIG_SCSI_FUTURE_DOMAIN, fdomain.o, scsi)
-AC_DRIVER(in2000, CONFIG_SCSI_IN2000, in2000.o, scsi)
-AC_DRIVER(ncr5380, CONFIG_SCSI_GENERIC_NCR5380, g_NCR5380.o, scsi)
-AC_DRIVER(ncr53c406a, CONFIG_SCSI_NCR53C406A, NCR53c406a.o, scsi)
-AC_DRIVER(pas16, CONFIG_SCSI_PASS16, pas16.o, scsi)
-AC_DRIVER(seagate, CONFIG_SCSI_SEAGATE, seagate.o, scsi)
-AC_DRIVER(t128, CONFIG_SCSI_T128, t128.o, scsi)
-AC_DRIVER(ncr53c7xx, CONFIG_SCSI_NCR53C7xx, 53c78xx.o, scsi)
-AC_DRIVER(eatadma, CONFIG_SCSI_EATA_DMA, eata_dma.o, scsi)
-AC_DRIVER(eatapio, CONFIG_SCSI_EATA_PIO, eata_pio.o, scsi)
-AC_DRIVER(wd7000, CONFIG_SCSI_7000FASST, wd7000.o, scsi)
-AC_DRIVER(eata, CONFIG_SCSI_EATA, eata.o, scsi)
-AC_DRIVER(am53c974, CONFIG_SCSI_AM53C974, AM53C974.o, scsi)
-AC_DRIVER(dtc3280, CONFIG_SCSI_DTC3280, dtc.o, scsi)
-AC_DRIVER(ncr53c8xx, CONFIG_SCSI_NCR53C8XX, ncr53c8xx.o, scsi)
-AC_DRIVER(dc390w, CONFIG_SCSI_DC390W, tmscsiw.o, scsi)
-AC_DRIVER(dc390t, CONFIG_SCSI_DC390T, tmscsim.o, scsi)
-AC_DRIVER(ppa, CONFIG_SCSI_PPA, ppa.o, scsi)
-AC_DRIVER(qlogicfas, CONFIG_SCSI_QLOGIC_FAS, qlogicfas.o, scsi)
-AC_DRIVER(qlogicisp, CONFIG_SCSI_QLOGIC_ISP, qlogicisp.o, scsi)
-AC_DRIVER(gdth, CONFIG_SCSI_GDTH, gdth.o, scsi)
-
-
+linux_DRIVER(advansys, SCSI_ADVANSYS, advansys, scsi)
+linux_DRIVER(buslogic, SCSI_BUSLOGIC, BusLogic, scsi)
+linux_DRIVER(u1434f, SCSI_U14_34F, u14-34f, scsi)
+linux_DRIVER(ultrastor, SCSI_ULTRASTOR, ultrastor, scsi)
+linux_DRIVER(aha152x, SCSI_AHA152X, aha152x, scsi)
+linux_DRIVER(aha1542, SCSI_AHA1542, aha1542, scsi)
+linux_DRIVER(aha1740, SCSI_AHA1740, aha1740, scsi)
+linux_DRIVER(aic7xxx, SCSI_AIC7XXX, aic7xxx, scsi)
+linux_DRIVER(futuredomain, SCSI_FUTURE_DOMAIN, fdomain, scsi)
+linux_DRIVER(in2000, SCSI_IN2000, in2000, scsi)
+linux_DRIVER(ncr5380, SCSI_GENERIC_NCR5380, g_NCR5380, scsi)
+linux_DRIVER(ncr53c406a, SCSI_NCR53C406A, NCR53c406a, scsi)
+linux_DRIVER(pas16, SCSI_PASS16, pas16, scsi)
+linux_DRIVER(seagate, SCSI_SEAGATE, seagate, scsi)
+linux_DRIVER(t128, SCSI_T128, t128, scsi)
+linux_DRIVER(ncr53c7xx, SCSI_NCR53C7xx, 53c78xx, scsi)
+linux_DRIVER(eatadma, SCSI_EATA_DMA, eata_dma, scsi)
+linux_DRIVER(eatapio, SCSI_EATA_PIO, eata_pio, scsi)
+linux_DRIVER(wd7000, SCSI_7000FASST, wd7000, scsi)
+linux_DRIVER(eata, SCSI_EATA, eata, scsi)
+linux_DRIVER(am53c974, SCSI_AM53C974, AM53C974, scsi)
+linux_DRIVER(dtc3280, SCSI_DTC3280, dtc, scsi)
+linux_DRIVER(ncr53c8xx, SCSI_NCR53C8XX, ncr53c8xx, scsi)
+linux_DRIVER(dc390w, SCSI_DC390W, tmscsiw, scsi)
+linux_DRIVER(dc390t, SCSI_DC390T, tmscsim, scsi)
+linux_DRIVER(ppa, SCSI_PPA, ppa, scsi)
+linux_DRIVER(qlogicfas, SCSI_QLOGIC_FAS, qlogicfas, scsi)
+linux_DRIVER(qlogicisp, SCSI_QLOGIC_ISP, qlogicisp, scsi)
+linux_DRIVER(gdth, SCSI_GDTH, gdth, scsi)
 dnl Dirty implementation...
 
 AC_ARG_ENABLE(flashpoint,,[
@@ -157,48 +161,46 @@ dnl Ethernet controllers
 
 AC_DRIVER(ne2000, CONFIG_NE2000, ne.o 8390.o, net)
 AC_DRIVER(el2, CONFIG_EL2, 3c503.o 8390.o, net)
-AC_DRIVER(el3, CONFIG_EL3, 3c509.o, net)
+linux_DRIVER(el3, EL3, 3c509, net)
 AC_DRIVER(wd80x3, CONFIG_WD80x3, wd.o 8390.o, net)
-AC_DRIVER(el1, CONFIG_EL1, 3c501.o, net)
+linux_DRIVER(el1, EL1, 3c501, net)
 AC_DRIVER(ul, CONFIG_ULTRA, smc-ultra.o 8390.o, net)
 AC_DRIVER(ul32, CONFIG_ULTRA32, smc-ultra32.o 8390.o, net)
 AC_DRIVER(hplanplus, CONFIG_HPLAN_PLUS, hp-plus.o 8390.o, net)
 AC_DRIVER(hplan, CONFIG_HPLAN, hp.o 8390.o, net)
-AC_DRIVER(vortex, CONFIG_VORTEX, 3c59x.o, net)
-AC_DRIVER(seeq8005, CONFIG_SEEQ8005, seeq8005.o, net)
-AC_DRIVER(hp100, CONFIG_HP100, hp100.o, net)
+linux_DRIVER(vortex, VORTEX, 3c59x, net)
+linux_DRIVER(seeq8005, SEEQ8005, seeq8005, net)
+linux_DRIVER(hp100, HP100, hp100, net)
 AC_DRIVER(ac3200, CONFIG_AC3200, ac3200.o 8390.o, net)
 AC_DRIVER(e2100, CONFIG_E2100, e2100.o 8390.o, net)
-AC_DRIVER(at1700, CONFIG_AT1700, at1700.o, net)
-AC_DRIVER(eth16i, CONFIG_ETH16I, eth16i.o, net)
-AC_DRIVER(znet, CONFIG_ZNET, znet.o, net)
-AC_DRIVER(eexpress, CONFIG_EEXPRESS, eexpress.o, net)
-AC_DRIVER(eexpresspro, CONFIG_EEXPRESS_PRO, eepro.o, net)
-AC_DRIVER(eexpresspro100, CONFIG_EEXPRESS_PRO100B, eepro100.o, net)
-AC_DRIVER(depca, CONFIG_DEPCA, depca.o, net)
-AC_DRIVER(ewrk3, CONFIG_EWRK3, ewrk3.o, net)
-AC_DRIVER(de4x5, CONFIG_DE4X5, de4x5.o, net)
-AC_DRIVER(apricot, CONFIG_APRICOT, apricot.o, net)
-AC_DRIVER(wavelan, CONFIG_WAVELAN, wavelan.o, net)
-AC_DRIVER(el16, CONFIG_EL16, 3c507.o, net)
-AC_DRIVER(elplus, CONFIG_ELPLUS, 3c505.o, net)
-AC_DRIVER(de600, CONFIG_DE600, de600.o, net)
-AC_DRIVER(de620, CONFIG_DE620, de620.o, net)
-AC_DRIVER(skg16, CONFIG_SK_G16, sk_g16.o, net)
-AC_DRIVER(ni52, CONFIG_NI52, ni52.o, net)
-AC_DRIVER(ni65, CONFIG_NI65, ni65.o, net)
-AC_DRIVER(atp, CONFIG_ATP, atp.o, net)
-AC_DRIVER(lance, CONFIG_LANCE, lance.o, net)
-AC_DRIVER(elcp, CONFIG_DEC_ELCP, tulip.o, net)
-AC_DRIVER(fmv18x, CONFIG_FMV18X, fmv18x.o, net)
-AC_DRIVER(3c515, CONFIG_3C515, 3c515.o, net)
-AC_DRIVER(pcnet32, CONFIG_PCNET32, pcnet32.o, net)
+linux_DRIVER(at1700, AT1700, at1700, net)
+linux_DRIVER(eth16i, ETH16I, eth16i, net)
+linux_DRIVER(znet, ZNET, znet, net)
+linux_DRIVER(eexpress, EEXPRESS, eexpress, net)
+linux_DRIVER(eexpresspro, EEXPRESS_PRO, eepro, net)
+linux_DRIVER(eexpresspro100, EEXPRESS_PRO100B, eepro100, net)
+linux_DRIVER(depca, DEPCA, depca, net)
+linux_DRIVER(ewrk3, EWRK3, ewrk3, net)
+linux_DRIVER(de4x5, DE4X5, de4x5, net)
+linux_DRIVER(apricot, APRICOT, apricot, net)
+linux_DRIVER(wavelan, WAVELAN, wavelan, net)
+linux_DRIVER(el16, EL16, 3c507, net)
+linux_DRIVER(elplus, ELPLUS, 3c505, net)
+linux_DRIVER(de600, DE600, de600, net)
+linux_DRIVER(de620, DE620, de620, net)
+linux_DRIVER(skg16, SK_G16, sk_g16, net)
+linux_DRIVER(ni52, NI52, ni52, net)
+linux_DRIVER(ni65, NI65, ni65, net)
+linux_DRIVER(atp, ATP, atp, net)
+linux_DRIVER(lance, LANCE, lance, net)
+linux_DRIVER(elcp, DEC_ELCP, tulip, net)
+linux_DRIVER(fmv18x, FMV18X, fmv18x, net)
+linux_DRIVER(3c515, 3C515, 3c515, net)
+linux_DRIVER(pcnet32, PCNET32, pcnet32, net)
 AC_DRIVER(ne2kpci, CONFIG_NE2K_PCI, ne2k-pci.o 8390.o, net)
-AC_DRIVER(yellowfin, CONFIG_YELLOWFIN, yellowfin.o, net)
-AC_DRIVER(rtl8139, CONFIG_RTL8139, rtl8139.o, net)
-AC_DRIVER(epic, CONFIG_EPIC, epic100.o, net)
-AC_DRIVER(tlan, CONFIG_TLAN, tlan.o, net)
-AC_DRIVER(viarhine, CONFIG_VIA_RHINE, via-rhine.o, net)
-
-
+linux_DRIVER(yellowfin, YELLOWFIN, yellowfin, net)
+linux_DRIVER(rtl8139, RTL8139, rtl8139, net)
+linux_DRIVER(epic, EPIC, epic100, net)
+linux_DRIVER(tlan, TLAN, tlan, net)
+linux_DRIVER(viarhine, VIA_RHINE, via-rhine, net)
 AC_OUTPUT(Makefile)