2006-09-20 Thomas Schwinge <tschwinge@gnu.org>

* Drivers.macros (AC_DRIVER_ALIAS): Remove definition.
	(AC_DRIVER): Extend to take a `description' parameter and consider
	`$enable_default_device_drivers'.
	(AC_DRIVER_nodef): New definition.
	* configure.in (options kdb, kmsg): Remove redundancy.
	* i386/configure.in (option default-device-drivers): New option.
	(option lpr): Consider `$enable_default_device_drivers'.
	* i386/linux/configure.ac: Rework substantially.  Remove all aliases.
	Rename some of the device driver options.
	(option default-device-drivers): New option.
	(linux_DRIVER): Take care about a `description' parameter and don't
	invoke AC_DRIVER_ALIAS.
	(linux_DRIVER_nodef): New definition.
	Adopt all usages of AC_DRIVER and linux_DRIVER to provide a
	`description' parameter.
	(g_NCR5380, NCR53c406a, eata_dma, wavelan, atp): Change from AC_DRIVER
	to AC_DRIVER_nodef to have these device drivers disabled by default.
	* doc/mach.texi: Add a note about the outdatedness to the configuration
	option table.
	* i386/README-Drivers: Update.

7 files changed, 529 insertions, 359 deletions

diff --git a/ChangeLog b/ChangeLog
index 4fa0d1d..e986f66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2006-09-20  Thomas Schwinge  <tschwinge@gnu.org>
+
+	* Drivers.macros (AC_DRIVER_ALIAS): Remove definition.
+	(AC_DRIVER): Extend to take a `description' parameter and consider
+	`$enable_default_device_drivers'.
+	(AC_DRIVER_nodef): New definition.
+	* configure.in (options kdb, kmsg): Remove redundancy.
+	* i386/configure.in (option default-device-drivers): New option.
+	(option lpr): Consider `$enable_default_device_drivers'.
+	* i386/linux/configure.ac: Rework substantially.  Remove all aliases.
+	Rename some of the device driver options.
+	(option default-device-drivers): New option.
+	(linux_DRIVER): Take care about a `description' parameter and don't
+	invoke AC_DRIVER_ALIAS.
+	(linux_DRIVER_nodef): New definition.
+	Adopt all usages of AC_DRIVER and linux_DRIVER to provide a
+	`description' parameter.
+	(g_NCR5380, NCR53c406a, eata_dma, wavelan, atp): Change from AC_DRIVER
+	to AC_DRIVER_nodef to have these device drivers disabled by default.
+	* doc/mach.texi: Add a note about the outdatedness to the configuration
+	option table.
+	* i386/README-Drivers: Update.
+	
 2006-09-19  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
 	[bug #17338 --- ``GNU Mach vs. GCC 4.1'']
diff --git a/Drivers.macros b/Drivers.macros
index 5fa1db4..d7168fa 100644
--- a/Drivers.macros
+++ b/Drivers.macros
@@ -1,7 +1,7 @@
 dnl
 dnl Some autoconf macros useful for device driver configuration
 dnl
-dnl Copyright 1997 Free Software Foundation, Inc.
+dnl Copyright 1997, 2006 Free Software Foundation, Inc.
 dnl Permission to use, copy, modify and distribute this software and its
 dnl documentation is hereby granted, provided that both the copyright
 dnl notice and this permission notice appear in all copies of the
@@ -15,16 +15,6 @@ dnl USE OF THIS SOFTWARE.
 
 AC_SUBST([device_drivers])
 
-dnl AC_DRIVER_ALIAS(alias, canonical) makes --enable-alias have the
-dnl same effect as --enable-canonical.
-
-AC_DEFUN([AC_DRIVER_ALIAS], [
-[#] Checking for alias [$1]
-AC_ARG_ENABLE([$1],
-  AS_HELP_STRING([--enable-$1], [enable driver alias $1 for $2]),
-  [enable_$2="$enable_$1"]
-)])
-
 dnl AC_DRIVER_CLASS(name,option,files) defines a class of drivers.  If
 dnl any driver declared by AC_DRIVER to be in that class is selected
 dnl by the user, then set the specified option with AC_DEFINE and add
@@ -37,22 +27,40 @@ driver_class_$1_option=$2
 driver_class_$1_files="$3"
 ])
 
-dnl AC_DRIVER(name,option,files [,class]) detects option --enable-name.  If
+dnl AC_DRIVER(name,description,option,files[,class]).  Process configuration
+dnl option --enable-`name' (with description dnl `description').  If
 dnl it's set, then `option' is defined with AC_DEFINE, and files is
 dnl added to the output variable `device_drivers'.  The driver is of class
 dnl `class'; see the comments on AC_DRIVER_CLASS for more information.
+dnl By default, the value from $enable_default_device_drivers is considered
+dnl when deciding whether to activate the device driver or not.
 
 AC_DEFUN([AC_DRIVER], [
-[#] Checking for device driver option [$1]
 AC_ARG_ENABLE([$1],
-AS_HELP_STRING([--enable-$1], [enable driver $1]), [
-if test "x$enableval" != xno; then
-AC_DEFINE([$2], [1], [$1])
-device_drivers="$device_drivers [$3]"
-if test "${driver_class_[$4]_selected+set}" != set; then
-  driver_class_[$4]_selected=yes
-  AC_DEFINE_UNQUOTED([$driver_class_$4_option], [1])
-  device_drivers="$device_drivers $driver_class_[$4]_files"
-fi
-fi
-])])
+  AS_HELP_STRING([--disable-$1], [disable driver $2]))
+[enable_$1=${enable_$1-$enable_default_device_drivers}
+if test x"$enable_$1" = xyes; then]
+  AC_DEFINE([$3], [1], [$1])
+  [device_drivers="$device_drivers $4"
+  if test "${driver_class_$5_selected+set}" != set; then
+    driver_class_$5_selected=yes]
+    AC_DEFINE_UNQUOTED([$driver_class_$5_option], [1])
+    [device_drivers="$device_drivers $driver_class_$5_files"
+  fi
+fi]])
+
+dnl AC_DEFUN_nodef() is like AC_DRIVER(), but doesn't consider
+dnl $enable_default_device_drivers.
+
+AC_DEFUN([AC_DRIVER_nodef], [
+AC_ARG_ENABLE([$1],
+  AS_HELP_STRING([--enable-$1], [enable driver $2]), [
+if test x"$enableval" = xyes; then
+  AC_DEFINE([$3], [1], [$1])
+  device_drivers="$device_drivers $4"
+  if test "${driver_class_$5_selected+set}" != set; then
+    driver_class_$5_selected=yes
+    AC_DEFINE_UNQUOTED([$driver_class_$5_option], [1])
+    device_drivers="$device_drivers $driver_class_$5_files"
+  fi
+fi])])
diff --git a/configure.in b/configure.in
index 0a0baeb..539c54d 100644
--- a/configure.in
+++ b/configure.in
@@ -37,13 +37,16 @@ AC_PREFIX_DEFAULT([])
 # Options
 #
 AC_ARG_ENABLE([kdb],
-AS_HELP_STRING([--enable-kdb], [enable use of in-kernel debugger]),
-[test "x$enableval" = xno || AC_DEFINE([MACH_KDB], [1], [enable use of in-kernel debugger])])
+AS_HELP_STRING([--enable-kdb], [enable use of in-kernel debugger]))
+[if test x"$enable_kdb" = xyes; then]
+  AC_DEFINE([MACH_KDB], [1], [enable use of in-kernel debugger])
+[fi]
 
 AC_ARG_ENABLE([kmsg],
-AS_HELP_STRING([--enable-kmsg], [enable use of kmsg device [[default=yes]]]),
-[test "x$enableval" = xno || AC_DEFINE([MACH_KMSG], [], [enable use of kmsg device])],
-			    [AC_DEFINE([MACH_KMSG], [], [enable use of kmsg device])])
+AS_HELP_STRING([--disable-kmsg], [disable use of kmsg device]))
+[if test x"$enable_kmsg" != xno; then]
+  AC_DEFINE([MACH_KMSG], [], [enable use of kmsg device])
+[fi]
 
 #
 # Programs
diff --git a/doc/mach.texi b/doc/mach.texi
index cac6667..e7e1234 100644
--- a/doc/mach.texi
+++ b/doc/mach.texi
@@ -538,6 +538,9 @@ where it is installed.
 
 The default for an option is to be disabled, unless otherwise noted.
 
+This table is out-dated.  Please see the file @file{i386/README-Drivers}
+and the output of @code{[GNU Mach]/configure --help=recursive}.
+
 @table @code
 @item --prefix @var{prefix}
 Sets the prefix to PREFIX.  The default prefix is the empty string, which
diff --git a/i386/README-Drivers b/i386/README-Drivers
index ee3c8df..fa5fdfb 100644
--- a/i386/README-Drivers
+++ b/i386/README-Drivers
@@ -2,9 +2,19 @@
 
 ** Turning on or off device drivers
 
-Each device driver has an associated configure switch.  The table at
-the end of this file gives the list of configure switches.  For many
-devices there are multiple drivers to choose from.  
+Each device driver has an associated configure switch.  The table at the
+end of this file indicates whether a device driver is enabled by default
+or not.  It also gives --- if possible at all --- the configure switches
+to use for disabling or enabling device drivers, in case you're not
+satisfied with the default choices.  Where a `--disable-*' switch is
+given in the table, the device driver is enabled by default and you have
+to use the switch to disable it and vice versa for the `--enable-*'
+switches, the device driver is disabled by default and you have to us the
+switch to enable it.  To have all device drivers disabled that can be
+disabled and would otherwise have been enabled by default you can specify
+the `--disable-default-device-drivers' switch and then use the
+`--enable-*' switches to enable only those you actually want to have
+enabled.
 
 
 ** What the configure switches do
@@ -26,12 +36,15 @@ are believed to work.
 ** Then comes the name of the device to users.  %d is a unit number.
 
 
-***
+** Source files
 
-All source file names are relative to .../gnumach/i386/i386at for Mach
-drivers, and .../gnumach/linux/src/drivers for Linux drivers.
+All source file names are relative to [GNU Mach]/i386/i386at/ for
+Mach drivers, and the Linux drivers's files can be found below
+[GNU Mach]/linux/.
 
 
+** Table
+
 *** Serial devices and similar equivalents
 
 PC com ports (always enabled)
@@ -39,7 +52,7 @@ PC com ports (always enabled)
 	com%d
 
 Parallel port
-  --enable-lpr				lpr.c
+  --disable-lpr				lpr.c
 	lpr%d
 
 System Console (always enabled)
@@ -66,267 +79,228 @@ Interface to setting up IO port access for users (always enabled)
 	iopl%d
 
 
-
 *** Disk controllers (except for SCSI)
 
 PC floppy
-  --enable-floppy			block/floppy.c
+  --disable-floppy		block/floppy.c
 	0x3f0, 370
 	fd%d
 
 IDE disks
-  --enable-ide		block/{cmd640,ide-cd,ide,rz1000,triton}.c
+  --disable-ide			block/{cmd640,ide-cd,ide,rz1000,triton}.c
 	hd%d	(disks)
 	wcd%d	(cdroms)
 
 
-*** SCSI disks Disks all show up as `sd%d'.  CD Roms all show up as
-`cd%d'.  Tapes and generic are not currently supported.
+*** SCSI disks
+
+Disks all show up as `sd%d'.  CD Roms all show up as `cd%d'.  Tapes and
+generic are not currently supported.
 
 AdvanSys
-  --enable-advansys		scsi/advansys.c
+  --disable-advansys		scsi/advansys.c
 
 BusLogic
-  --enable-buslogic		scsi/{BusLogic,FlashPoint}.c
-  --disable-flashpoint (if you want to omit FlashPoint support)
+  --disable-BusLogic		scsi/{BusLogic,FlashPoint}.c
+  --enable-flashpoint (if you want to omit FlashPoint support)
 
 UltraStor 14F/34F
-  --enable-u1434f		scsi/u14-34f.c
+  --disable-u1434f		scsi/u14-34f.c
 
 UlstraStor
-  --enable-ultrastor		scsi/ultrastor.c
+  --disable-ultrastor		scsi/ultrastor.c
 
-Adaptec AHA-152x/2825
-  --enable-aha152x		scsi/aha152x.c
-  --enable-aha2825
+Adaptec AHA-152x/2825 (aha152x, aha2825)
+  --disable-aha152x		scsi/aha152x.c
 
 Adaptec AHA-1542
-  --enable-aha1542		scsi/aha1540.c
+  --disable-aha1542		scsi/aha1540.c
 
 Adaptec AHA-1740
-  --enable-aha1740		scsi/aha1740.c
+  --disable-aha1740		scsi/aha1740.c
 
 Adaptec AIC7xxx
-  --enable-aic7xxx		scsi/aic7xxx.c
+  --disable-aic7xxx		scsi/aic7xxx.c
 
 Future Domain 16xx
-  --enable-futuredomain		scsi/fdomain.c
+  --disable-fdomain		scsi/fdomain.c
 
 Always IN 2000
-  --enable-in2000		scsi/in2000.c
+  --disable-in2000		scsi/in2000.c
 
-Generic NCR5380/53c400
-  --enable-ncr5380		scsi/g_NCR5380.c
-  --enable-ncr53c400
+Generic NCR5380/53c400 (ncr5380, ncr53c400)
+  --enable-g_NCR5380		scsi/g_NCR5380.c
 
 NCR53c406a chip
-  --enable-ncr53c406a		scsi/NCR53c406a.c
+  --enable-NCR53c406a		scsi/NCR53c406a.c
 
-PAS16				scsi/pas16.c
-  --enable-pas16
+PAS16
+  --disable-pas16		scsi/pas16.c
 
 Seagate ST02, Future Domain TMC-8xx
-  --enable-seagate		scsi/seagate.c
+  --disable-seagate		scsi/seagate.c
 
-Trantor T128/T128F/T228
-  --enable-t128			scsi/t128.c
-  --enable-t128f
-  --enable-t228
+Trantor T128/T128F/T228 (t128, t128f, t228)
+  --disable-t128		scsi/t128.c
 
 NCR 53C7,8xx
-  --enable-ncr53c7xx		scsi/53c78xx.c
+  --disable-ncr53c78xx		scsi/53c78xx.c
 
 EATA-DMA (DPT, NEC, AT&T, SNI, AST, Olivetti, Alphatronix)
-  --enable-eatadma		scsi/eata_dma.c
+  --enable-eata_dma		scsi/eata_dma.c
 
 EATA-PIO (old DPT PM2001, PM2012A)
-  --enable-eatapio		scsi/eata_pio.c
+  --disable-eata_pio		scsi/eata_pio.c
 
 WD 7000
-  --enable-wd7000		scsi/wd7000.c
+  --disable-wd7000		scsi/wd7000.c
 
 EATA ISA/EISA/PCI (DPT and generic EATA/DMA-compliant boards)
-  --enable-eata			scsi/eata.c
+  --disable-eata		scsi/eata.c
 
-AM53/79C974
-  --enable-am53c974		scsi/AM53C974.c
-  --enable-am79c974
+AM53/79C974 (am53c974, am79c974)
+  --disable-AM53C974		scsi/AM53C974.c
 
-DTC3180/3280
-  --enable-dtc3280		scsi/dtc.c
-  --enable-dtc3180
+DTC3180/3280 (dtc3180, dtc3280)
+  --disable-dtc	       		scsi/dtc.c
 
-NCR53C8XX
-  --enable-ncr53c8xx		scsi/ncr53c8xx.c
-  --enable-dc390w
-  --enable-dc390u
-  --enable-dc390f
+NCR53C8XX (ncr53c8xx, dc390f, dc390u, dc390w)
+  --disable-ncr53c8xx		scsi/ncr53c8xx.c
 
-Tekram DC-390(T)
-  --enable-dc390t		scsi/tmscsim.c
-  --enable-dc390
+Tekram DC-390(T) (dc390, dc390t)
+  --disable-tmscsim		scsi/tmscsim.c
 
 IOMEGA Parallel Port ZIP drive
-  --enable-ppa			scsi/ppa.c
+  --disable-ppa			scsi/ppa.c
 
 Qlogic FAS
-  --enable-qlogicfas		scsi/qlogicfas.c
+  --disable-qlogicfas		scsi/qlogicfas.c
 
 Qlogic ISP
-  --enable-qlogicisp		scsi/qlogicisp.c
+  --disable-qlogicisp		scsi/qlogicisp.c
 
 GDT SCSI Disk Array Controller
-  --enable-gdth			scsi/gdth.c
+  --disable-gdth		scsi/gdth.c
 
 
 *** Ethernet controllers
 These all show up as `eth%d' except the atp device.
 
-NE2000/NE1000 ISA
-  --enable-ne2000			net/ne.c 8390.c
-  --enable-ne1000
+NE2000/NE1000 ISA (ne, ne1000, ne2000)
+  --disable-ne				net/ne.c 8390.c
 	0x300,280,320,340,360
 
-3Com 503 (Etherlink II)
-  --enable-3c503			net/3c503.c net/8390.c
-  --enable-el2
+3Com 503 (3c503) / Etherlink II
+  --disable-3c503			net/3c503.c net/8390.c
 	0x300,310,330,350,250,280,2a0,2e0
 
-3Com 509/579 (Etherlink III)
-  --enable-3c509			net/3c509.c 
-  --enable-3c579
-  --enable-el3
+3Com 509/579 (3c509, 3c579) / Etherlink III
+  --disable-3c509			net/3c509.c 
 
-WD80*3
-  --enable-wd80x3			net/wd.c, net/8390.c
+WD80x3
+  --disable-wd				net/wd.c, net/8390.c
 	0x300,280,380,240
 
-3COM 501
-  --enable-3c501			net/3c501.c
-  --enable-el1
-	0x280, 300
+3COM 501 (3c501) / Etherlink I
+  --disable-3c501			net/3c501.c
+	0x280,300
 
 SMC Ultra
-  --enable-ul				net/smc-ultra.c net/8390.c
+  --disable-smcultra			net/smc-ultra.c net/8390.c
 	0x200,220,240,280,300,340,380
 
 SMC Ultra32
-  --enable-ul32				net/smc-ultra32.c net/8390.c
+  --disable-smcultra32			net/smc-ultra32.c net/8390.c
 
 HP PCLAN+ (27247B and 27252A)
-  --enable-hplanplus			net/hp-plus.c net/8390.c
+  --disable-hpplus			net/hp-plus.c net/8390.c
 	0x200,240,280,2c0,300,320,340
 
 HP PCLAN (27245 and other 27xxx series)
-  --enable-hplan			net/hp.c, net/8390.c
+  --disable-hp	 			net/hp.c, net/8390.c
 	0x300,320,340,280,2c0,200,240
 
-3Com 590/900 series (592/595/597/900/905) "Vortex/Boomerang"
-  --enable-3c59x
-  --enable-3c90x
-  --enable-vortex			net/3c59x.c
+3Com 59x/90x (3c59x, 3c590, 3c592, 3c595, 3c597, 3c90x, 3c900, 3c905) "Vortex/Boomerang"
+  --disable-3c59x			net/3c59x.c
 
 Seeq8005
-  --enable-seeq8005			net/seeq8005.c
+  --disable-seeq8005			net/seeq8005.c
 	0x300,320,340,360
 
-HP 10/100VG PCLAN (ISA, EISA, PCI)
-  --enable-hp100			net/hp100.c
-  --enable-hpj2577
-  --enable-hpj2573
-  --enable-hp27248b
-  --enable-hp2585
+HP 10/100VG PCLAN (ISA, EISA, PCI) (hp100, hpj2577, hpj2573, hpj2585, hp27248b)
+  --disable-hp100			net/hp100.c
 
 Ansel Communications EISA 3200
-  --enable-ac3200			net/ac3200.c, net/8390.c
+  --disable-ac3200			net/ac3200.c, net/8390.c
 
 Cabletron E21xx
-  --enable-e2100			net/e2100.c, net/8390.c
+  --disable-e2100			net/e2100.c, net/8390.c
 	0x300,280,380,220
 
 AT1700 (Fujitsu 86965)
-  --enable-at1700			net/at1700.c
+  --disable-at1700			net/at1700.c
 	0x260,280,2a0,240,340,320,380,300
 
-ICL EtherTeam 16i/32
-  --enable-eth16i			net/eth16i.c 
-  --enable-eth32
+ICL EtherTeam 16i/32 (eth16i, eth32)
+  --disable-eth16i			net/eth16i.c 
 	0x260,280,2a0,240,340,320,380,300 (16i)
 
-Zenith Z-Note
-  --enable-znet				net/znet.c
-  --enable-znote
+Zenith Z-Note (znet, znote)
+  --disable-znet			net/znet.c
 
 EtherExpress 16
-  --enable-eexpress			net/eexpress.c
+  --disable-eexpress			net/eexpress.c
 	0x300,270,320,340
 
 EtherExpressPro
-  --enable-eexpresspro			net/eepro.c
+  --disable-eepro			net/eepro.c
 	0x200,240,280,2c0,300,320,340,360
 
 Intel EtherExpressPro PCI 10+/100B/100+
-  --enable-eexpresspro100		net/eepro100.c
-
-DEPCA, DE10x, DE200, DE201, DE202, DE210, DE422
-  --enable-depca			net/depca.c
-  --enable-de100
-  --enable-de101
-  --enable-de200
-  --enable-de201
-  --enable-de202
-  --enable-de210
-  --enable-de422
-
-EtherWORKS 3 (DE203, DE204, DE205)
-  --enable-ewrk3			net/ewrk3.c
-  --enable-de203
-  --enable-de204
-  --enable-de205
-
-DE425, DE434, DE435, DE450, DE500
-  --enable-de4x5			net/de4x5.c
-  --enable-de425
-  --enable-de434
-  --enable-de435
-  --enable-de450
-  --enable-de500
+  --disable-eepro100			net/eepro100.c
+
+DEPCA (de100, de101, de200, de201, de202, de210, de422)
+  --disable-depca			net/depca.c
+
+EtherWORKS 3 (ewrk3, de203, de204, de205)
+  --disable-ewrk3			net/ewrk3.c
+
+DE4x5 (de4x5, de425, de434, de435, de450, de500)
+  --disable-de4x5			net/de4x5.c
 
 Apricot XEN-II on board ethernet
-  --enable-apricot			net/apricot.c
+  --disable-apricot			net/apricot.c
 
 AT&T WaveLAN & DEC RoamAbout DS
   --enable-wavelan			net/wavelan.c
 	0x390
 
-3Com 507
-  --enable-3c507			net/3c507.c
-  --enable-el16
+3Com 507 (3c507, el16)
+  --disable-3c507			net/3c507.c
 	0x300,320,340,280
 
-3Com 505
-  --enable-3c505			net/3c505.c
-  --enable-elplus
+3Com 505 (3c505, elplus)
+  --disable-3c505			net/3c505.c
 	0x300,280,310
 
 D-Link DE-600
-  --enable-de600			net/de600.c
+  --disable-de600			net/de600.c
 	0x378
 
 D-Link DE-620
-  --enable-de620			net/de620.c
+  --disable-de620			net/de620.c
 	0x378
 
 Schneider & Koch G16
-  --enable-skg16			net/sk_g16.c
+  --disable-sk_g16			net/sk_g16.c
 	0x100,180,208,220,288,320,328,390
 
 NI5210
-  --enable-ni52				net/ni52.c
+  --disable-ni52			net/ni52.c
 	0x300,280,360,320,340
 
 NI6510
-  --enable-ni65				net/ni65.c
+  --disable-ni65			net/ni65.c
 	0x300/320/340/360
 
 AT-LAN-TEC/RealTek pocket adaptor
@@ -334,101 +308,99 @@ AT-LAN-TEC/RealTek pocket adaptor
 	0x378,278,3bc
 	atp%d
 
-AMD LANCE and PCnet (AT1500 and NE2100)
-  --enable-lance			net/lance.c
-  --enable-at1500
-  --enable-ne2100
+AMD LANCE and PCnet (at1500, ne2100)
+  --disable-lance			net/lance.c
 
-DECchip Tulip (dc21x4x) PCI
-  --enable-elcp				net/tulip.c
-  --enable-tulip
+DECchip Tulip (dc21x4x) PCI (elcp, tulip)
+  --disable-tulip			net/tulip.c
 
 FMV-181/182/183/184
-  --enable-fmv18x			net/fmv18x.c
+  --disable-fmv18x			net/fmv18x.c
 
 3Com 515 ISA Fast EtherLink
-  --enable-3c515			net/3c515.c
+  --disable-3c515			net/3c515.c
 
 AMD PCI PCnet32 (PCI bus NE2100 cards)
-  --enable-pcnet32			net/pcnet32.c
+  --disable-pcnet32			net/pcnet32.c
 
 PCI NE2000
-  --enable-ne2kpci			net/ne2k-pci.c
+  --disable-ne2kpci			net/ne2k-pci.c
 
 Packet Engines Yellowfin Gigabit-NIC
-  --enable-yellowfin			net/yellowfin.c
+  --disable-yellowfin			net/yellowfin.c
 
-RealTek 8129/8139 (not 8019/8029!)
-  --enable-rtl8139			net/rtl8139.c
-  --enable-rtl8129
+RealTek 8129/8139 (rtl8129, rtl8139) (not 8019/8029!)
+  --disable-rtl8139			net/rtl8139.c
 
-SMC 83c170/175 EPIC/100 (EtherPower II)
-  --enable-epic				net/epic100.c
-  --enable-epic100
+SMC 83c170/175 EPIC/100 (epic, epic100) / EtherPower II
+  --disable-epic100			net/epic100.c
 
 TI ThunderLAN
-  --enable-tlan				net/tlan.c
+  --disable-tlan			net/tlan.c
 
 VIA Rhine
-  --enable-viarhine			net/via_rhine.c
+  --disable-viarhine			net/via-rhine.c
 
 Packet Engines "Hamachi" GNIC-2 Gigabit Ethernet
-  --enable-hamachi			net/hamachi.c
+  --disable-hamachi			net/hamachi.c
 
 Intel PCI Gigabit Ethernet
-  --enable-intel-gige			net/intel-gige.c
+  --disable-intelgige			net/intel-gige.c
 
 Myson MTD803 Ethernet adapter series
-  --enable-myson803			net/myson803.c
+  --disable-myson803			net/myson803.c
 
 National Semiconductor DP8381x series PCI Ethernet
-  --enable-natsemi			net/natsemi.c
+  --disable-natsemi			net/natsemi.c
 
 National Semiconductor DP8382x series PCI Ethernet
-  --enable-ns820			net/ns820.c
+  --disable-ns820			net/ns820.c
 
 Adaptec Starfire network adapter
-  --enable-starfire			net/starfire.c
+  --disable-starfire			net/starfire.c
 
 Sundance ST201 "Alta" PCI Ethernet
-  --enable-sundance			net/sundance.c
+  --disable-sundance			net/sundance.c
 
 Winbond W89c840 PCI Ethernet
-  --enable-winbond-840			net/winbond-840.c
+  --disable-winbond840			net/winbond-840.c
 
 *** pcmcia bridge drivers
-All source files are relative to .../gnumach/linux/pcmcia-cs.
+
+All source files are relative to [GNU Mach]/linux/pcmcia-cs.
 
 Intel 82365 PC Card controller
-  --enable-i82365			modules/i82365.c
+  --disable-i82365			modules/i82365.c
 
 *** pcmcia device drivers
+
 These all show up as `eth%d'.
-All source files are relative to .../gnumach/linux/pcmcia-cs.
+
+All source files are relative to [GNU Mach]/linux/pcmcia-cs.
 
 3Com 3c574 ``RoadRunner'' PCMCIA Ethernet
-  --enable-3c574_cs			clients/3c574_cs.c
+  --disable-3c574_cs			clients/3c574_cs.c
 
 3Com 3c589 PCMCIA Ethernet card
-  --enable-3c589_cs			clients/3c589_cs.c
+  --disable-3c589_cs			clients/3c589_cs.c
 
 Asix AX88190-based PCMCIA Ethernet adapters
-  --enable-axnet_cs			clients/axnet_cs.c
+  --disable-axnet_cs			clients/axnet_cs.c
 
 fmvj18x chipset based PCMCIA Ethernet cards
-  --enable-fmvj18x_cs			clients/fmvj18x_cs.c
+  --disable-fmvj18x_cs			clients/fmvj18x_cs.c
 
 New Media Ethernet LAN PCMCIA cards
-  --enable-nmclan_cs			clients/nmclan_cs.c
+  --disable-nmclan_cs			clients/nmclan_cs.c
 
 NS8390-based PCMCIA cards
-  --enable-pcnet_cs			clients/pcnet_cs.c
+  --disable-pcnet_cs			clients/pcnet_cs.c
 
 SMC91c92-based PCMCIA cards
-  --enable-smc91c92_cs			clients/smc91c92_cs.c
+  --disable-smc91c92_cs			clients/smc91c92_cs.c
 
 Xircom CreditCard and Realport PCMCIA ethernet
-  --enable-xirc2ps_cs			clients/xirc2ps_cs.c
+  --disable-xirc2ps_cs			clients/xirc2ps_cs.c
 
 Hermes or Prism 2 PCMCIA Wireless adapters (Orinoco)
-  --enable-orinoco_cs			wireless/orinoco_cs.c
+  --disable-orinoco_cs			wireless/orinoco_cs.c
diff --git a/i386/configure.in b/i386/configure.in
index afc931b..93d7476 100644
--- a/i386/configure.in
+++ b/i386/configure.in
@@ -22,9 +22,21 @@ AC_PREREQ(2.57)
 #
 # Options
 #
+AC_ARG_ENABLE([default-device-drivers],
+AS_HELP_STRING([--disable-default-device-drivers], [have all device drivers
+disabled that can be disabled and would otherwise have been enabled by default;
+then use the `--enable-*' options to enable only those you actually want to
+have enabled]))
+[if test x"$enable_default_device_drivers" != xno
+then enable_default_device_drivers=yes
+fi]
+
 AC_ARG_ENABLE([lpr],
-AS_HELP_STRING([--enable-lpr], [enable use of lpr device]),
-[test "x$enableval" = xno || AC_DEFINE([MACH_LPR], [], [enable mach lpr])])
+  AS_HELP_STRING([--disable-lpr], [disable use of lpr device]))
+[enable_lpr=${enable_lpr-$enable_default_device_drivers}
+if test x"$enable_lpr" = xyes
+then] AC_DEFINE([MACH_LPR], [], [enable mach lpr])
+[fi]
 
 AC_CONFIG_SUBDIRS([linux])
 
diff --git a/i386/linux/configure.ac b/i386/linux/configure.ac
index 0e37013..9ce468c 100644
--- a/i386/linux/configure.ac
+++ b/i386/linux/configure.ac
@@ -44,56 +44,17 @@ esac
 
 hurd_SYSTYPE
 
-
-dnl Aliases have to come first.
-
-AC_DRIVER_ALIAS([3c501], [el1])
-AC_DRIVER_ALIAS([3c503], [el2])
-AC_DRIVER_ALIAS([3c509], [el3])
-AC_DRIVER_ALIAS([3c579], [el3])
-AC_DRIVER_ALIAS([3c59x], [vortex])
-AC_DRIVER_ALIAS([3c90x], [vortex])
-AC_DRIVER_ALIAS([hpj2577], [hp100])
-AC_DRIVER_ALIAS([hpj2573], [hp100])
-AC_DRIVER_ALIAS([hpj2585], [hp100])
-AC_DRIVER_ALIAS([hp27248b], [hp100])
-AC_DRIVER_ALIAS([eth32], [eth16i])
-AC_DRIVER_ALIAS([znote], [znet])
-AC_DRIVER_ALIAS([de100], [depca])
-AC_DRIVER_ALIAS([de101], [depca])
-AC_DRIVER_ALIAS([de200], [depca])
-AC_DRIVER_ALIAS([de201], [depca])
-AC_DRIVER_ALIAS([de202], [depca])
-AC_DRIVER_ALIAS([de210], [depca])
-AC_DRIVER_ALIAS([de422], [depca])
-AC_DRIVER_ALIAS([de203], [ewrk3])
-AC_DRIVER_ALIAS([de204], [ewrk3])
-AC_DRIVER_ALIAS([de205], [ewrk3])
-AC_DRIVER_ALIAS([de425], [de4x5])
-AC_DRIVER_ALIAS([de434], [de4x5])
-AC_DRIVER_ALIAS([de435], [de4x5])
-AC_DRIVER_ALIAS([de450], [de4x5])
-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])
-AC_DRIVER_ALIAS([rtl8129], [rtl8139])
-AC_DRIVER_ALIAS([aha2825], [aha152x])
-AC_DRIVER_ALIAS([ncr53c400], [ncr5380])
-AC_DRIVER_ALIAS([t128f], [t128])
-AC_DRIVER_ALIAS([t228], [t128])
-AC_DRIVER_ALIAS([am79c974], [am53c974])
-AC_DRIVER_ALIAS([dtc3180], [dtc3280])
-AC_DRIVER_ALIAS([dc390w], [ncr53c8xx])
-AC_DRIVER_ALIAS([dc390u], [ncr53c8xx])
-AC_DRIVER_ALIAS([dc390f], [ncr53c8xx])
-AC_DRIVER_ALIAS([dc390], [dc390t])
-AC_DRIVER_ALIAS([epic100], [epic])
-
+#
+# Options.
+#
+AC_ARG_ENABLE([default-device-drivers],
+AS_HELP_STRING([--disable-default-device-drivers], [have all device drivers
+disabled that can be disabled and would otherwise have been enabled by default;
+then use the `--enable-*' options to enable only those you actually want to
+have enabled]))
+[if test x"$enable_default_device_drivers" != xno
+then enable_default_device_drivers=yes
+fi]
 
 dnl Kinds of drivers that have gobs of source files that get brought in.
 
@@ -118,136 +79,324 @@ dnl
 dnl linux_DRIVER(machname, MACRO, linuxname, class)
 dnl
 AC_DEFUN([linux_DRIVER], [
-  m4_if([$1], [$3],, [AC_DRIVER_ALIAS([$3], [$1])])
-  AC_DRIVER([$1], [CONFIG_$2], [$3.o], [$4])
-])dnl
+  AC_DRIVER([$1], [$2], [CONFIG_$3], [$4.o], [$5])
+])
+AC_DEFUN([linux_DRIVER_nodef], [
+  AC_DRIVER_nodef([$1], [$2], [CONFIG_$3], [$4.o], [$5])
+])
 
 dnl non-SCSI Disk controllers
 
-AC_DRIVER([floppy], [CONFIG_BLK_DEV_FD], [floppy.o])
-AC_DRIVER([ide], [CONFIG_BLK_DEV_IDE], [ \
-  cmd640.o ide-cd.o ide.o rz1000.o triton.o])
+AC_DRIVER([floppy],
+  [PC floppy],
+  [CONFIG_BLK_DEV_FD], [floppy.o])
+AC_DRIVER([ide],
+  [IDE disks],
+  [CONFIG_BLK_DEV_IDE], [cmd640.o ide-cd.o ide.o rz1000.o triton.o])
 
 
 dnl SCSI Disk controllers
 
-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([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])
+linux_DRIVER([advansys],
+  [SCSI controller AdvanSys],
+  [SCSI_ADVANSYS], [advansys], [scsi])
+linux_DRIVER([BusLogic],
+  [SCSI controller BusLogic],
+  [SCSI_BUSLOGIC], [BusLogic], [scsi])
+# TODO.  What's that?  And what about FlashPoint.o?
 dnl Dirty implementation...
-
 AC_ARG_ENABLE([flashpoint],
-  AS_HELP_STRING([--enable-flashpoint], [enable SCSI flashpoint [[default=no]]]),
+  AS_HELP_STRING([--enable-flashpoint], [enable SCSI flashpoint]),
   [test x"$enableval" = xno &&
    AC_DEFINE([CONFIG_SCSI_OMIT_FLASHPOINT], [], [scsi omit flashpoint])])
+linux_DRIVER([u1434f],
+  [SCSI controller UltraStor 14F/34F],
+  [SCSI_U14_34F], [u14-34f], [scsi])
+linux_DRIVER([ultrastor],
+  [SCSI controller UltraStor],
+  [SCSI_ULTRASTOR], [ultrastor], [scsi])
+linux_DRIVER([aha152x],
+  [SCSI controller Adaptec AHA-152x/2825 (aha152x, aha2825)],
+  [SCSI_AHA152X], [aha152x], [scsi])
+linux_DRIVER([aha1542],
+  [SCSI controller Adaptec AHA-1542],
+  [SCSI_AHA1542], [aha1542], [scsi])
+linux_DRIVER([aha1740],
+  [SCSI controller Adaptec AHA-1740],
+  [SCSI_AHA1740], [aha1740], [scsi])
+linux_DRIVER([aic7xxx],
+  [SCSI controller Adaptec AIC7xxx],
+  [SCSI_AIC7XXX], [aic7xxx], [scsi])
+linux_DRIVER([fdomain],
+  [SCSI controller Future Domain 16xx],
+  [SCSI_FUTURE_DOMAIN], [fdomain], [scsi])
+linux_DRIVER([in2000],
+  [SCSI controller Always IN 2000],
+  [SCSI_IN2000], [in2000], [scsi])
+# Disabled by default.
+linux_DRIVER_nodef([g_NCR5380],
+  [SCSI controller Generic NCR5380/53c400 (ncr5380, ncr53c400)],
+  [SCSI_GENERIC_NCR5380], [g_NCR5380], [scsi])
+# Disabled by default.
+linux_DRIVER_nodef([NCR53c406a],
+  [SCSI controller NCR53c406a chip],
+  [SCSI_NCR53C406A], [NCR53c406a], [scsi])
+linux_DRIVER([pas16],
+  [SCSI controller PAS16],
+  [SCSI_PASS16], [pas16], [scsi])
+linux_DRIVER([seagate],
+  [SCSI controller Seagate ST02, Future Domain TMC-8xx],
+  [SCSI_SEAGATE], [seagate], [scsi])
+linux_DRIVER([t128],
+  [SCSI controller Trantor T128/T128F/T228 (t128, t128f, t228)],
+  [SCSI_T128], [t128], [scsi])
+linux_DRIVER([53c78xx],
+  [SCSI controller NCR 53C7,8xx],
+  [SCSI_NCR53C7xx], [53c78xx], [scsi])
+# Disabled by default.
+linux_DRIVER_nodef([eata_dma],
+  [SCSI controller EATA-DMA (DPT, NEC, AT&T, SNI, AST, Olivetti, Alphatronix)],
+  [SCSI_EATA_DMA], [eata_dma], [scsi])
+linux_DRIVER([eata_pio],
+  [SCSI controller EATA-PIO (old DPT PM2001, PM2012A)],
+  [SCSI_EATA_PIO], [eata_pio], [scsi])
+linux_DRIVER([wd7000],
+  [SCSI controller WD 7000],
+  [SCSI_7000FASST], [wd7000], [scsi])
+linux_DRIVER([eata],
+  [SCSI controller EATA ISA/EISA/PCI (DPT and generic EATA/DMA-compliant boards)],
+  [SCSI_EATA], [eata], [scsi])
+linux_DRIVER([AM53C974],
+  [SCSI controller AM53/79C974 (am53c974, am79c974)],
+  [SCSI_AM53C974], [AM53C974], [scsi])
+linux_DRIVER([dtc],
+  [SCSI controller DTC3180/3280 (dtc3180, dtc3280)],
+  [SCSI_DTC3280], [dtc], [scsi])
+linux_DRIVER([ncr53c8xx],
+  [SCSI controller NCR53C8XX (ncr53c8xx, dc390f, dc390u, dc390w)],
+  [SCSI_NCR53C8XX], [ncr53c8xx], [scsi])
+linux_DRIVER([tmscsim],
+  [SCSI controller Tekram DC-390(T) (dc390, dc390t)],
+  [SCSI_DC390T], [tmscsim], [scsi])
+linux_DRIVER([ppa],
+  [IOMEGA Parallel Port ZIP drive],
+  [SCSI_PPA], [ppa], [scsi])
+linux_DRIVER([qlogicfas],
+  [SCSI controller Qlogic FAS],
+  [SCSI_QLOGIC_FAS], [qlogicfas], [scsi])
+linux_DRIVER([qlogicisp],
+  [SCSI controller Qlogic ISP],
+  [SCSI_QLOGIC_ISP], [qlogicisp], [scsi])
+linux_DRIVER([gdth],
+  [GDT SCSI Disk Array Controller],
+  [SCSI_GDTH], [gdth], [scsi])
 
 
 dnl Ethernet controllers
 
+AC_DRIVER([ne],
+  [Ethernet controller NE2000/NE1000 ISA (ne, ne1000, ne2000)],
+  [CONFIG_NE2000], [ne.o 8390.o], [net])
+AC_DRIVER([3c503],
+  [Ethernet controller 3Com 503 (3c503) / Etherlink II],
+  [CONFIG_EL2], [3c503.o 8390.o], [net])
+linux_DRIVER([3c509],
+  [Ethernet controller 3Com 509/579 (3c509, 3c579) / Etherlink III],
+  [EL3], [3c509], [net])
+AC_DRIVER([wd],
+  [Ethernet controller WD80x3],
+  [CONFIG_WD80x3], [wd.o 8390.o], [net])
+linux_DRIVER([3c501],
+  [Ethernet controller 3COM 501 (3c501) / Etherlink I],
+  [EL1], [3c501], [net])
+AC_DRIVER([smcultra],
+  [Ethernet controller SMC Ultra],
+  [CONFIG_ULTRA], [smc-ultra.o 8390.o], [net])
+AC_DRIVER([smcultra32],
+  [Ethernet controller SMC Ultra32],
+  [CONFIG_ULTRA32], [smc-ultra32.o 8390.o], [net])
+AC_DRIVER([hpplus],
+  [Ethernet controller HP PCLAN+ (27247B and 27252A)],
+  [CONFIG_HPLAN_PLUS], [hp-plus.o 8390.o], [net])
+AC_DRIVER([hp],
+  [Ethernet controller HP PCLAN (27245 and other 27xxx series)],
+  [CONFIG_HPLAN], [hp.o 8390.o], [net])
+linux_DRIVER([3c59x],
+  [Ethernet controller 3Com 59x/90x (3c59x, 3c590, 3c592, 3c595, 3c597, 3c90x, 3c900, 3c905) "Vortex/Boomerang"],
+  [VORTEX], [3c59x], [net])
+linux_DRIVER([seeq8005],
+  [Ethernet controller Seeq8005],
+  [SEEQ8005], [seeq8005], [net])
+linux_DRIVER([hp100],
+  [Ethernet controller HP 10/100VG PCLAN (ISA, EISA, PCI) (hp100, hpj2577, hpj2573, hpj2585, hp27248b)],
+  [HP100], [hp100], [net])
+AC_DRIVER([ac3200],
+  [Ethernet controller Ansel Communications EISA 3200],
+  [CONFIG_AC3200], [ac3200.o 8390.o], [net])
+AC_DRIVER([e2100],
+  [Ethernet controller Cabletron E21xx],
+  [CONFIG_E2100], [e2100.o 8390.o], [net])
+linux_DRIVER([at1700],
+  [Ethernet controller AT1700 (Fujitsu 86965)],
+  [AT1700], [at1700], [net])
+linux_DRIVER([eth16i],
+  [Ethernet controller ICL EtherTeam 16i/32 (eth16i, eth32)],
+  [ETH16I], [eth16i], [net])
+linux_DRIVER([znet],
+  [Ethernet controller Zenith Z-Note (znet, znote)],
+  [ZNET], [znet], [net])
+linux_DRIVER([eexpress],
+  [Ethernet controller EtherExpress 16],
+  [EEXPRESS], [eexpress], [net])
+linux_DRIVER([eepro],
+  [Ethernet controller EtherExpressPro],
+  [EEXPRESS_PRO], [eepro], [net])
+linux_DRIVER([eepro100],
+  [Ethernet controller Intel EtherExpressPro PCI 10+/100B/100+],
+  [EEXPRESS_PRO100B], [eepro100], [net])
+linux_DRIVER([depca],
+  [Ethernet controller DEPCA (de100, de101, de200, de201, de202, de210, de422)],
+  [DEPCA], [depca], [net])
+linux_DRIVER([ewrk3],
+  [Ethernet controller EtherWORKS 3 (ewrk3, de203, de204, de205)],
+  [EWRK3], [ewrk3], [net])
+linux_DRIVER([de4x5],
+  [Ethernet controller DE4x5 (de4x5, de425, de434, de435, de450, de500)],
+  [DE4X5], [de4x5], [net])
+linux_DRIVER([apricot],
+  [Ethernet controller Apricot XEN-II on board ethernet],
+  [APRICOT], [apricot], [net])
+# Disabled by default.
+linux_DRIVER_nodef([wavelan],
+  [Ethernet controller AT&T WaveLAN & DEC RoamAbout DS],
+  [WAVELAN], [wavelan], [net])
+linux_DRIVER([3c507],
+  [Ethernet controller 3Com 507 (3c507, el16)],
+  [EL16], [3c507], [net])
+linux_DRIVER([3c505],
+  [Ethernet controller 3Com 505 (3c505, elplus)],
+  [ELPLUS], [3c505], [net])
+linux_DRIVER([de600],
+  [Ethernet controller D-Link DE-600],
+  [DE600], [de600], [net])
+linux_DRIVER([de620],
+  [Ethernet controller D-Link DE-620],
+  [DE620], [de620], [net])
+linux_DRIVER([sk_g16],
+  [Ethernet controller Schneider & Koch G16],
+  [SK_G16], [sk_g16], [net])
+linux_DRIVER([ni52],
+  [Ethernet controller NI5210],
+  [NI52], [ni52], [net])
+linux_DRIVER([ni65],
+  [Ethernet controller NI6510],
+  [NI65], [ni65], [net])
+# Disabled by default.
+linux_DRIVER_nodef([atp],
+  [Ethernet controller AT-LAN-TEC/RealTek pocket adaptor],
+  [ATP], [atp], [net])
+linux_DRIVER([lance],
+  [Ethernet controller AMD LANCE and PCnet (at1500, ne2100)],
+  [LANCE], [lance], [net])
+linux_DRIVER([tulip],
+  [Ethernet controller DECchip Tulip (dc21x4x) PCI (elcp, tulip)],
+  [DEC_ELCP], [tulip], [net])
+linux_DRIVER([fmv18x],
+  [Ethernet controller FMV-181/182/183/184],
+  [FMV18X], [fmv18x], [net])
+linux_DRIVER([3c515],
+  [Ethernet controller 3Com 515 ISA Fast EtherLink],
+  [3C515], [3c515], [net])
+linux_DRIVER([pcnet32],
+  [Ethernet controller AMD PCI PCnet32 (PCI bus NE2100 cards)],
+  [PCNET32], [pcnet32], [net])
+AC_DRIVER([ne2kpci],
+  [Ethernet controller PCI NE2000],
+  [CONFIG_NE2K_PCI], [ne2k-pci.o 8390.o], [net])
+linux_DRIVER([yellowfin],
+  [Ethernet controller Packet Engines Yellowfin Gigabit-NIC],
+  [YELLOWFIN], [yellowfin], [net])
+linux_DRIVER([rtl8139],
+  [Ethernet controller RealTek 8129/8139 (rtl8129, rtl8139) (not 8019/8029!)],
+  [RTL8139], [rtl8139], [net])
+linux_DRIVER([epic100],
+  [Ethernet controller SMC 83c170/175 EPIC/100 (epic, epic100) / EtherPower II],
+  [EPIC], [epic100], [net])
+linux_DRIVER([tlan],
+  [Ethernet controller TI ThunderLAN],
+  [TLAN], [tlan], [net])
+linux_DRIVER([viarhine],
+  [Ethernet controller VIA Rhine],
+  [VIA_RHINE], [via-rhine], [net])
+linux_DRIVER([hamachi],
+  [Ethernet controller Packet Engines "Hamachi" GNIC-2 Gigabit Ethernet],
+  [HAMACHI], [hamachi], [net])
+linux_DRIVER([intelgige],
+  [Ethernet controller Intel PCI Gigabit Ethernet],
+  [INTEL_GIGE], [intel-gige], [net])
+linux_DRIVER([myson803],
+  [Ethernet controller Myson MTD803 Ethernet adapter series],
+  [MYSON803], [myson803], [net])
+linux_DRIVER([natsemi],
+  [Ethernet controller National Semiconductor DP8381x series PCI Ethernet],
+  [NATSEMI], [natsemi], [net])
+linux_DRIVER([ns820],
+  [Ethernet controller National Semiconductor DP8382x series PCI Ethernet],
+  [NS820], [ns820], [net])
+linux_DRIVER([starfire],
+  [Ethernet controller Adaptec Starfire network adapter],
+  [STARFIRE], [starfire], [net])
+linux_DRIVER([sundance],
+  [Ethernet controller Sundance ST201 "Alta" PCI Ethernet],
+  [SUNDANCE], [sundance], [net])
+linux_DRIVER([winbond840],
+  [Ethernet controller Winbond W89c840 PCI Ethernet],
+  [WINBOND840], [winbond-840], [net])
 dnl FIXME: Can't be enabled since it is a pcmcia driver, and we don't
 dnl have that kind of fluff.
 dnl
 dnl linux_DRIVER([cb_shim], [CB_SHIM], [cb_shim], [net])
 
-linux_DRIVER([starfire], [STARFIRE], [starfire], [net])
-linux_DRIVER([sundance], [SUNDANCE], [sundance], [net])
-linux_DRIVER([winbond_840], [WINBOND840], [winbond-840], [net])
-linux_DRIVER([hamachi], [HAMACHI], [hamachi], [net])
-linux_DRIVER([intel_gige], [INTEL_GIGE], [intel-gige], [net])
-linux_DRIVER([natsemi], [NATSEMI], [natsemi], [net])
-linux_DRIVER([myson803], [MYSON803], [myson803], [net])
-linux_DRIVER([ns820], [NS820], [ns820], [net])
-
-AC_DRIVER([ne2000], [CONFIG_NE2000], [ne.o 8390.o], [net])
-AC_DRIVER([el2], [CONFIG_EL2], [3c503.o 8390.o], [net])
-linux_DRIVER([el3], [EL3], [3c509], [net])
-AC_DRIVER([wd80x3], [CONFIG_WD80x3], [wd.o 8390.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])
-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])
-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])
-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])
 
 
 dnl PCMCIA device support.
 
-linux_DRIVER([i82365], [I82365], [i82365], [pcmcia])
+linux_DRIVER([i82365],
+  [Intel 82365 PC Card controller],
+  [I82365], [i82365], [pcmcia])
 
 dnl PCMCIA device drivers.
 
-linux_DRIVER([3c574_cs], [3C574_CS], [3c574_cs], [pcmcia])
-linux_DRIVER([3c589_cs], [3C589_CS], [3c589_cs], [pcmcia])
-linux_DRIVER([axnet_cs], [AXNET_CS], [axnet_cs], [pcmcia])
-linux_DRIVER([fmvj18x_cs], [FMVJ18X_CS], [fmvj18x_cs], [pcmcia])
-linux_DRIVER([nmclan_cs], [NMCLAN_CS], [nmclan_cs], [pcmcia])
-AC_DRIVER([pcnet_cs], [CONFIG_PCNET_CS], [pcnet_cs.o 8390.o], [pcmcia])
-linux_DRIVER([smc91c92_cs], [SMC91C92_CS], [smc91c92_cs], [pcmcia])
-linux_DRIVER([xirc2ps_cs], [XIRC2PS_CS], [xirc2ps_cs], [pcmcia])
+linux_DRIVER([3c574_cs],
+  [3Com 3c574 ``RoadRunner'' PCMCIA Ethernet],
+  [3C574_CS], [3c574_cs], [pcmcia])
+linux_DRIVER([3c589_cs],
+  [3Com 3c589 PCMCIA Ethernet card],
+  [3C589_CS], [3c589_cs], [pcmcia])
+linux_DRIVER([axnet_cs],
+  [Asix AX88190-based PCMCIA Ethernet adapters],
+  [AXNET_CS], [axnet_cs], [pcmcia])
+linux_DRIVER([fmvj18x_cs],
+  [fmvj18x chipset based PCMCIA Ethernet cards],
+  [FMVJ18X_CS], [fmvj18x_cs], [pcmcia])
+linux_DRIVER([nmclan_cs],
+  [New Media Ethernet LAN PCMCIA cards],
+  [NMCLAN_CS], [nmclan_cs], [pcmcia])
+AC_DRIVER([pcnet_cs],
+  [NS8390-based PCMCIA cards],
+  [CONFIG_PCNET_CS], [pcnet_cs.o 8390.o], [pcmcia])
+linux_DRIVER([smc91c92_cs],
+  [SMC91c92-based PCMCIA cards],
+  [SMC91C92_CS], [smc91c92_cs], [pcmcia])
+linux_DRIVER([xirc2ps_cs],
+  [Xircom CreditCard and Realport PCMCIA ethernet],
+  [XIRC2PS_CS], [xirc2ps_cs], [pcmcia])
 
 dnl Wireless device drivers.
 
-AC_DRIVER([orinoco_cs], [CONFIG_ORINOCO_CS], [ \
-  hermes.o orinoco.o orinoco_cs.o], [wireless])
+AC_DRIVER([orinoco_cs],
+  [Hermes or Prism 2 PCMCIA Wireless adapters (Orinoco)],
+  [CONFIG_ORINOCO_CS], [hermes.o orinoco.o orinoco_cs.o], [wireless])
 
 
 dnl If any pcmcia wireless devices have been enabled, make sure to include the