2006-07-27 Thomas Schwinge <tschwinge@gnu.org>

* i386/linux/configure: Regenerate.
	* i386/linux/device-drivers.h.in: Likewise.

2 files changed, 376 insertions, 0 deletions

diff --git a/i386/linux/configure b/i386/linux/configure
index bbf5e81..373311e 100755
--- a/i386/linux/configure
+++ b/i386/linux/configure
@@ -937,6 +937,16 @@ Optional Features:
   --enable-tlan           enable driver tlan
   --enable-via-rhine      enable driver alias via-rhine for viarhine
   --enable-viarhine       enable driver viarhine
+  --enable-i82365         enable driver i82365
+  --enable-3c574_cs       enable driver 3c574_cs
+  --enable-3c589_cs       enable driver 3c589_cs
+  --enable-axnet_cs       enable driver axnet_cs
+  --enable-fmvj18x_cs     enable driver fmvj18x_cs
+  --enable-nmclan_cs      enable driver nmclan_cs
+  --enable-pcnet_cs       enable driver pcnet_cs
+  --enable-smc91c92_cs    enable driver smc91c92_cs
+  --enable-xirc2ps_cs     enable driver xirc2ps_cs
+  --enable-orinoco_cs     enable driver orinoco_cs
 
 Report bugs to <bug-hurd@gnu.org>.
 _ACEOF
@@ -1952,6 +1962,21 @@ driver_class_net_files=" \
 
 
 
+driver_class_pcmcia_option=CONFIG_PCMCIA
+driver_class_pcmcia_files=" \
+  pcmcia.o cs.o ds.o rsrc_mgr.o bulkmem.o cistpl.o pci_fixup.o"
+
+
+
+
+
+driver_class_wireless_option=CONFIG_WIRELESS
+driver_class_wireless_files=""
+
+
+
+
+
 
 
 # Checking for device driver option floppy
@@ -4320,6 +4345,303 @@ fi
 fi;
 
 
+
+
+
+
+
+# Checking for device driver option i82365
+# Check whether --enable-i82365 or --disable-i82365 was given.
+if test "${enable_i82365+set}" = set; then
+  enableval="$enable_i82365"
+
+if test "x$enableval" != xno; then
+
+cat >>confdefs.h <<\_ACEOF
+#define CONFIG_I82365 1
+_ACEOF
+
+device_drivers="$device_drivers i82365.o"
+if test "${driver_class_pcmcia_selected+set}" != set; then
+  driver_class_pcmcia_selected=yes
+  cat >>confdefs.h <<_ACEOF
+#define $driver_class_pcmcia_option 1
+_ACEOF
+
+  device_drivers="$device_drivers $driver_class_pcmcia_files"
+fi
+fi
+
+fi;
+
+
+
+
+
+
+# Checking for device driver option 3c574_cs
+# Check whether --enable-3c574_cs or --disable-3c574_cs was given.
+if test "${enable_3c574_cs+set}" = set; then
+  enableval="$enable_3c574_cs"
+
+if test "x$enableval" != xno; then
+
+cat >>confdefs.h <<\_ACEOF
+#define CONFIG_3C574_CS 1
+_ACEOF
+
+device_drivers="$device_drivers 3c574_cs.o"
+if test "${driver_class_pcmcia_selected+set}" != set; then
+  driver_class_pcmcia_selected=yes
+  cat >>confdefs.h <<_ACEOF
+#define $driver_class_pcmcia_option 1
+_ACEOF
+
+  device_drivers="$device_drivers $driver_class_pcmcia_files"
+fi
+fi
+
+fi;
+
+
+
+
+# Checking for device driver option 3c589_cs
+# Check whether --enable-3c589_cs or --disable-3c589_cs was given.
+if test "${enable_3c589_cs+set}" = set; then
+  enableval="$enable_3c589_cs"
+
+if test "x$enableval" != xno; then
+
+cat >>confdefs.h <<\_ACEOF
+#define CONFIG_3C589_CS 1
+_ACEOF
+
+device_drivers="$device_drivers 3c589_cs.o"
+if test "${driver_class_pcmcia_selected+set}" != set; then
+  driver_class_pcmcia_selected=yes
+  cat >>confdefs.h <<_ACEOF
+#define $driver_class_pcmcia_option 1
+_ACEOF
+
+  device_drivers="$device_drivers $driver_class_pcmcia_files"
+fi
+fi
+
+fi;
+
+
+
+
+# Checking for device driver option axnet_cs
+# Check whether --enable-axnet_cs or --disable-axnet_cs was given.
+if test "${enable_axnet_cs+set}" = set; then
+  enableval="$enable_axnet_cs"
+
+if test "x$enableval" != xno; then
+
+cat >>confdefs.h <<\_ACEOF
+#define CONFIG_AXNET_CS 1
+_ACEOF
+
+device_drivers="$device_drivers axnet_cs.o"
+if test "${driver_class_pcmcia_selected+set}" != set; then
+  driver_class_pcmcia_selected=yes
+  cat >>confdefs.h <<_ACEOF
+#define $driver_class_pcmcia_option 1
+_ACEOF
+
+  device_drivers="$device_drivers $driver_class_pcmcia_files"
+fi
+fi
+
+fi;
+
+
+
+
+# Checking for device driver option fmvj18x_cs
+# Check whether --enable-fmvj18x_cs or --disable-fmvj18x_cs was given.
+if test "${enable_fmvj18x_cs+set}" = set; then
+  enableval="$enable_fmvj18x_cs"
+
+if test "x$enableval" != xno; then
+
+cat >>confdefs.h <<\_ACEOF
+#define CONFIG_FMVJ18X_CS 1
+_ACEOF
+
+device_drivers="$device_drivers fmvj18x_cs.o"
+if test "${driver_class_pcmcia_selected+set}" != set; then
+  driver_class_pcmcia_selected=yes
+  cat >>confdefs.h <<_ACEOF
+#define $driver_class_pcmcia_option 1
+_ACEOF
+
+  device_drivers="$device_drivers $driver_class_pcmcia_files"
+fi
+fi
+
+fi;
+
+
+
+
+# Checking for device driver option nmclan_cs
+# Check whether --enable-nmclan_cs or --disable-nmclan_cs was given.
+if test "${enable_nmclan_cs+set}" = set; then
+  enableval="$enable_nmclan_cs"
+
+if test "x$enableval" != xno; then
+
+cat >>confdefs.h <<\_ACEOF
+#define CONFIG_NMCLAN_CS 1
+_ACEOF
+
+device_drivers="$device_drivers nmclan_cs.o"
+if test "${driver_class_pcmcia_selected+set}" != set; then
+  driver_class_pcmcia_selected=yes
+  cat >>confdefs.h <<_ACEOF
+#define $driver_class_pcmcia_option 1
+_ACEOF
+
+  device_drivers="$device_drivers $driver_class_pcmcia_files"
+fi
+fi
+
+fi;
+
+
+# Checking for device driver option pcnet_cs
+# Check whether --enable-pcnet_cs or --disable-pcnet_cs was given.
+if test "${enable_pcnet_cs+set}" = set; then
+  enableval="$enable_pcnet_cs"
+
+if test "x$enableval" != xno; then
+
+cat >>confdefs.h <<\_ACEOF
+#define CONFIG_PCNET_CS 1
+_ACEOF
+
+device_drivers="$device_drivers pcnet_cs.o 8390.o"
+if test "${driver_class_pcmcia_selected+set}" != set; then
+  driver_class_pcmcia_selected=yes
+  cat >>confdefs.h <<_ACEOF
+#define $driver_class_pcmcia_option 1
+_ACEOF
+
+  device_drivers="$device_drivers $driver_class_pcmcia_files"
+fi
+fi
+
+fi;
+
+
+
+# Checking for device driver option smc91c92_cs
+# Check whether --enable-smc91c92_cs or --disable-smc91c92_cs was given.
+if test "${enable_smc91c92_cs+set}" = set; then
+  enableval="$enable_smc91c92_cs"
+
+if test "x$enableval" != xno; then
+
+cat >>confdefs.h <<\_ACEOF
+#define CONFIG_SMC91C92_CS 1
+_ACEOF
+
+device_drivers="$device_drivers smc91c92_cs.o"
+if test "${driver_class_pcmcia_selected+set}" != set; then
+  driver_class_pcmcia_selected=yes
+  cat >>confdefs.h <<_ACEOF
+#define $driver_class_pcmcia_option 1
+_ACEOF
+
+  device_drivers="$device_drivers $driver_class_pcmcia_files"
+fi
+fi
+
+fi;
+
+
+
+
+# Checking for device driver option xirc2ps_cs
+# Check whether --enable-xirc2ps_cs or --disable-xirc2ps_cs was given.
+if test "${enable_xirc2ps_cs+set}" = set; then
+  enableval="$enable_xirc2ps_cs"
+
+if test "x$enableval" != xno; then
+
+cat >>confdefs.h <<\_ACEOF
+#define CONFIG_XIRC2PS_CS 1
+_ACEOF
+
+device_drivers="$device_drivers xirc2ps_cs.o"
+if test "${driver_class_pcmcia_selected+set}" != set; then
+  driver_class_pcmcia_selected=yes
+  cat >>confdefs.h <<_ACEOF
+#define $driver_class_pcmcia_option 1
+_ACEOF
+
+  device_drivers="$device_drivers $driver_class_pcmcia_files"
+fi
+fi
+
+fi;
+
+
+
+
+
+
+
+
+# Checking for device driver option orinoco_cs
+# Check whether --enable-orinoco_cs or --disable-orinoco_cs was given.
+if test "${enable_orinoco_cs+set}" = set; then
+  enableval="$enable_orinoco_cs"
+
+if test "x$enableval" != xno; then
+
+cat >>confdefs.h <<\_ACEOF
+#define CONFIG_ORINOCO_CS 1
+_ACEOF
+
+device_drivers="$device_drivers  \
+		       hermes.o orinoco.o orinoco_cs.o"
+if test "${driver_class_wireless_selected+set}" != set; then
+  driver_class_wireless_selected=yes
+  cat >>confdefs.h <<_ACEOF
+#define $driver_class_wireless_option 1
+_ACEOF
+
+  device_drivers="$device_drivers $driver_class_wireless_files"
+fi
+fi
+
+fi;
+  if test x"${driver_class_pcmcia_selected+set}" != xset; then
+    driver_class_pcmcia_selected=yes
+    cat >>confdefs.h <<_ACEOF
+#define $driver_class_pcmcia_option 1
+_ACEOF
+
+    device_drivers="$device_drivers $driver_class_pcmcia_files"
+  fi
+
+
+if test x"${driver_class_pcmcia_selected+set}" = xset; then
+  if test x"${driver_class_net_selected+set}" != xset; then
+    driver_class_net_selected=yes
+    cat >>confdefs.h <<_ACEOF
+#define $driver_class_net_option 1
+_ACEOF
+
+    device_drivers="$device_drivers $driver_class_net_files"
+  fi
+fi
+
+
                     ac_config_files="$ac_config_files Makefile Makerules"
 
 cat >confcache <<\_ACEOF
diff --git a/i386/linux/device-drivers.h.in b/i386/linux/device-drivers.h.in
index f7c1250..6eeff57 100644
--- a/i386/linux/device-drivers.h.in
+++ b/i386/linux/device-drivers.h.in
@@ -3,6 +3,15 @@
 /* 3c515 */
 #undef CONFIG_3C515
 
+/* 3c574_cs */
+#undef CONFIG_3C574_CS
+
+/* 3c575_cb */
+#undef CONFIG_3C575_CB
+
+/* 3c589_cs */
+#undef CONFIG_3C589_CS
+
 /* ac3200 */
 #undef CONFIG_AC3200
 
@@ -15,12 +24,21 @@
 /* atp */
 #undef CONFIG_ATP
 
+/* axnet_cs */
+#undef CONFIG_AXNET_CS
+
 /* floppy */
 #undef CONFIG_BLK_DEV_FD
 
 /* ide */
 #undef CONFIG_BLK_DEV_IDE
 
+/* cardbus */
+#undef CONFIG_CARDBUS
+
+/* cb_enabler */
+#undef CONFIG_CB_ENABLER
+
 /* de4x5 */
 #undef CONFIG_DE4X5
 
@@ -39,6 +57,9 @@
 /* e2100 */
 #undef CONFIG_E2100
 
+/* eepro100_cb */
+#undef CONFIG_EEPRO100_CB
+
 /* eexpress */
 #undef CONFIG_EEXPRESS
 
@@ -66,6 +87,9 @@
 /* epic */
 #undef CONFIG_EPIC
 
+/* epic_cb */
+#undef CONFIG_EPIC_CB
+
 /* eth16i */
 #undef CONFIG_ETH16I
 
@@ -75,6 +99,9 @@
 /* fmv18x */
 #undef CONFIG_FMV18X
 
+/* fmvj18x_cs */
+#undef CONFIG_FMVJ18X_CS
+
 /* hamachi */
 #undef CONFIG_HAMACHI
 
@@ -87,6 +114,9 @@
 /* hplanplus */
 #undef CONFIG_HPLAN_PLUS
 
+/* i82365 */
+#undef CONFIG_I82365
+
 /* Driver Class net */
 #undef CONFIG_INET
 
@@ -126,12 +156,24 @@
 /* ni65 */
 #undef CONFIG_NI65
 
+/* nmclan_cs */
+#undef CONFIG_NMCLAN_CS
+
 /* ns820 */
 #undef CONFIG_NS820
 
+/* orinoco_cs */
+#undef CONFIG_ORINOCO_CS
+
+/* Driver Class pcmcia */
+#undef CONFIG_PCMCIA
+
 /* pcnet32 */
 #undef CONFIG_PCNET32
 
+/* pcnet_cs */
+#undef CONFIG_PCNET_CS
+
 /* rtl8139 */
 #undef CONFIG_RTL8139
 
@@ -231,6 +273,9 @@
 /* skg16 */
 #undef CONFIG_SK_G16
 
+/* smc91c92_cs */
+#undef CONFIG_SMC91C92_CS
+
 /* starfire */
 #undef CONFIG_STARFIRE
 
@@ -240,6 +285,9 @@
 /* tlan */
 #undef CONFIG_TLAN
 
+/* tulip_cb */
+#undef CONFIG_TULIP_CB
+
 /* ul */
 #undef CONFIG_ULTRA
 
@@ -261,6 +309,12 @@
 /* winbond_840 */
 #undef CONFIG_WINBOND840
 
+/* Driver Class wireless */
+#undef CONFIG_WIRELESS
+
+/* xirc2ps_cs */
+#undef CONFIG_XIRC2PS_CS
+
 /* yellowfin */
 #undef CONFIG_YELLOWFIN