2001-05-27 Marcus Brinkmann <marcus@gnu.org>

	* debian/rules: Add --enable-ncr53c8xx to configure.

1999-10-06  OKUJI Yoshinori  <okuji@kuicr.kyoto-u.ac.jp>

	* linux/src/drivers/scsi/tmscsiw.c: Removed.
	* linux/src/drivers/scsi/tmscsiw.h: Likewise.
	* linux/src/drivers/scsi/dc390w.h: Likewise.
	* i386/linux/device-drivers.h.in (CONFIG_SCSI_DC390W): Deleted.
	* i386/linux/Drivers.in: Remove linux_DRIVER(dc390w, ...). Now
	dc390w, dc390u, and dc390f are aliases to ncr53c8xx.
	* i386/linux/configure: Regenerated.
	* linux/Files: Likewise.
	* i386/linux/Makefile.in (linux-scsi-files): Delete tmscsiw.c.
	* linux/dev/drivers/scsi/hosts.c: Do not include dc390w.h.
	Reported by Andreas Voegele <andreas.voegele@nikocity.de>.

5 files changed, 366 insertions, 189 deletions

diff --git a/i386/README-Drivers b/i386/README-Drivers
index 7089b31..b95784f 100644
--- a/i386/README-Drivers
+++ b/i386/README-Drivers
@@ -158,14 +158,12 @@ DTC3180/3280
 
 NCR53C8XX
   --enable-ncr53c8xx		scsi/ncr53c8xx.c
-
-Tekram DC-390W/U/F
-  --enable-dc390w		scsi/tmsscsiw.c
+  --enable-dc390w
   --enable-dc390u
   --enable-dc390f
 
 Tekram DC-390(T)
-  --enable-dc390t		scsi/tmsscsim.c
+  --enable-dc390t		scsi/tmscsim.c
   --enable-dc390
 
 IOMEGA Parallel Port ZIP drive
diff --git a/i386/linux/Drivers.in b/i386/linux/Drivers.in
index 5e79064..21e9293 100644
--- a/i386/linux/Drivers.in
+++ b/i386/linux/Drivers.in
@@ -88,8 +88,9 @@ AC_DRIVER_ALIAS(t128f, t128)
 AC_DRIVER_ALIAS(t228, t128)
 AC_DRIVER_ALIAS(am79c974, am53c974)
 AC_DRIVER_ALIAS(dtc3180, dtc3280)
-AC_DRIVER_ALIAS(dc390u, dc390w)
-AC_DRIVER_ALIAS(dc390f, dc390w)
+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)
 
@@ -142,7 +143,6 @@ 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)
diff --git a/i386/linux/Makefile.in b/i386/linux/Makefile.in
index 2d7d3a6..da97105 100644
--- a/i386/linux/Makefile.in
+++ b/i386/linux/Makefile.in
@@ -83,7 +83,7 @@ linux-scsi-files = 53c78xx.c AM53C974.c BusLogic.c NCR53c406a.c advansys.c \
 	eata_dma.c eata_pio.c fdomain.c g_NCR5380.c gdth.c hosts.c in2000.c \
 	ncr53c8xx.c pas16.c ppa.c qlogicfas.c qlogicisp.c scsi.c scsi_ioctl.c \
 	scsi_proc.c scsicam.c sd.c sd_ioctl.c seagate.c sr.c sr_ioctl.c \
-	t128.c tmscsim.c tmscsiw.c u14-34f.c ultrastor.c wd7000.c
+	t128.c tmscsim.c u14-34f.c ultrastor.c wd7000.c
 vpath %.c $(linuxsrcdir)/dev/drivers/scsi
 vpath %.c $(linuxsrcdir)/src/drivers/scsi
 
diff --git a/i386/linux/configure b/i386/linux/configure
index ed8c293..a851dca 100755
--- a/i386/linux/configure
+++ b/i386/linux/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.12 
+# Generated automatically using autoconf version 2.13.1 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -377,8 +377,6 @@ ac_help="$ac_help
 "
 ac_help="$ac_help
 "
-ac_help="$ac_help
-"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -417,6 +415,7 @@ mandir='${prefix}/man'
 # Initialize some other variables.
 subdirs=
 MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
 # Maximum number of lines to put in a shell here document.
 ac_max_here_lines=12
 
@@ -700,7 +699,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.12"
+    echo "configure generated by autoconf version 2.13.1"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -860,7 +859,7 @@ done
 
 if test -r "$cache_file"; then
   echo "loading cache $cache_file"
-  . $cache_file
+      test -f "$cache_file" && . $cache_file
 else
   echo "creating cache $cache_file"
   > $cache_file
@@ -870,9 +869,11 @@ ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
+ac_exeext=
+ac_objext=o
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
@@ -911,8 +912,6 @@ fi
 
 
 
-
-
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   if test -f $ac_dir/install-sh; then
@@ -923,41 +922,59 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install.sh -c"
     break
+  elif test -f $ac_dir/shtool; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
   fi
 done
 if test -z "$ac_aux_dir"; then
   { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
 fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
+
 
+echo $ac_n "checking host system type""... $ac_c" 1>&6
+echo "configure:941: checking host system type" >&5
+if test "x$ac_cv_host" = "x" || (test "x$host" != "xNONE" && test "x$host" != "x$ac_cv_host_alias"); then
 
 # Make sure we can run config.sub.
-if $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
+  if $ac_config_sub sun4 >/dev/null 2>&1; then :
+    else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
+  fi
+
+  ac_cv_host_alias=$host
+  case "$ac_cv_host_alias" in
+  NONE)
+    case $nonopt in
+    NONE)
+      if ac_cv_host_alias=`$ac_config_guess`; then :
+      else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
+      fi ;;
+    *) ac_cv_host_alias=$nonopt ;;
+    esac ;;
+  esac
+
+  ac_cv_host=`$ac_config_sub $ac_cv_host_alias`
+  ac_cv_host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+  ac_cv_host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+  ac_cv_host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+else
+  echo $ac_n "(cached) $ac_c" 1>&6
 fi
 
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:943: checking host system type" >&5
+echo "$ac_t""$ac_cv_host" 1>&6
+
+host=$ac_cv_host
+host_alias=$ac_cv_host_alias
+host_cpu=$ac_cv_host_cpu
+host_vendor=$ac_cv_host_vendor
+host_os=$ac_cv_host_os
+
 
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`$ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
 
-host=`$ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
 
 
 case "$host_cpu" in
@@ -1009,23 +1026,45 @@ i[3456]86)	systype=i386 ;;
 esac
 
 
+
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:1014: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
+echo "configure:1032: checking build system type" >&5
+if test "x$ac_cv_build" = "x" || (test "x$build" != "xNONE" && test "x$build" != "x$ac_cv_build_alias"); then
+
+# Make sure we can run config.sub.
+  if $ac_config_sub sun4 >/dev/null 2>&1; then :
+    else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
+  fi
+
+  ac_cv_build_alias=$build
+  case "$ac_cv_build_alias" in
+  NONE)
+    case $nonopt in
+    NONE)
+      ac_cv_build_alias=$host_alias ;;
+
+    *) ac_cv_build_alias=$nonopt ;;
+    esac ;;
+  esac
+
+  ac_cv_build=`$ac_config_sub $ac_cv_build_alias`
+  ac_cv_build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+  ac_cv_build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+  ac_cv_build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+else
+  echo $ac_n "(cached) $ac_c" 1>&6
+fi
+
+echo "$ac_t""$ac_cv_build" 1>&6
+
+build=$ac_cv_build
+build_alias=$ac_cv_build_alias
+build_cpu=$ac_cv_build_cpu
+build_vendor=$ac_cv_build_vendor
+build_os=$ac_cv_build_os
+
+
 
-build=`$ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
 
 if test $host != $build; then
   ac_tool_prefix=${host_alias}-
@@ -1036,15 +1075,16 @@ fi
 # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1040: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+echo "configure:1079: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_CC="${ac_tool_prefix}gcc"
@@ -1067,15 +1107,16 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1071: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+echo "configure:1111: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_CC="gcc"
@@ -1096,16 +1137,17 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1100: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+echo "configure:1141: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_prog_rejected=no
-  for ac_dir in $PATH; do
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
@@ -1144,21 +1186,23 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1148: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1190: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
-cat > conftest.$ac_ext <<EOF
-#line 1158 "configure"
+cat > conftest.$ac_ext << EOF
+
+#line 1201 "configure"
 #include "confdefs.h"
+
 main(){return(0);}
 EOF
-if { (eval echo configure:1162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1172,6 +1216,12 @@ else
   ac_cv_prog_cc_works=no
 fi
 rm -fr conftest*
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
 
 echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
 if test $ac_cv_prog_cc_works = no; then
@@ -1182,14 +1232,14 @@ else
  cross_linkable=yes
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1186: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1236: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1192: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+echo "configure:1242: checking whether we are using GNU C" >&5
+if eval "test \"\${ac_cv_prog_gcc+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.c <<EOF
@@ -1197,7 +1247,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1251: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1231,15 +1281,16 @@ fi
 # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ld; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1235: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
+echo "configure:1285: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_prog_LD+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$LD"; then
   ac_cv_prog_LD="$LD" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_LD="${ac_tool_prefix}ld"
@@ -1632,11 +1683,20 @@ if test "${enable_dtc3180+set}" = set; then
 fi
 
 
+# Checking for alias dc390w
+# Check whether --enable-dc390w or --disable-dc390w was given.
+if test "${enable_dc390w+set}" = set; then
+  enableval="$enable_dc390w"
+  enable_ncr53c8xx="$enable_dc390w"
+
+fi
+
+
 # Checking for alias dc390u
 # Check whether --enable-dc390u or --disable-dc390u was given.
 if test "${enable_dc390u+set}" = set; then
   enableval="$enable_dc390u"
-  enable_dc390w="$enable_dc390u"
+  enable_ncr53c8xx="$enable_dc390u"
 
 fi
 
@@ -1645,7 +1705,7 @@ fi
 # Check whether --enable-dc390f or --disable-dc390f was given.
 if test "${enable_dc390f+set}" = set; then
   enableval="$enable_dc390f"
-  enable_dc390w="$enable_dc390f"
+  enable_ncr53c8xx="$enable_dc390f"
 
 fi
 
@@ -1689,7 +1749,8 @@ driver_class_net_files="auto_irq.o net.o Space.o dev.o net_init.o"
 # Check whether --enable-floppy or --disable-floppy was given.
 if test "${enable_floppy+set}" = set; then
   enableval="$enable_floppy"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_BLK_DEV_FD 1
 EOF
 
@@ -1702,6 +1763,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class__files"
 fi
+fi
 
 fi
 
@@ -1710,7 +1772,8 @@ fi
 # Check whether --enable-ide or --disable-ide was given.
 if test "${enable_ide+set}" = set; then
   enableval="$enable_ide"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_BLK_DEV_IDE 1
 EOF
 
@@ -1723,6 +1786,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class__files"
 fi
+fi
 
 fi
 
@@ -1743,7 +1807,8 @@ fi
 # Check whether --enable-advansys or --disable-advansys was given.
 if test "${enable_advansys+set}" = set; then
   enableval="$enable_advansys"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_SCSI_ADVANSYS 1
 EOF
 
@@ -1756,6 +1821,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_scsi_files"
 fi
+fi
 
 fi
 
@@ -1773,7 +1839,8 @@ fi
 # Check whether --enable-buslogic or --disable-buslogic was given.
 if test "${enable_buslogic+set}" = set; then
   enableval="$enable_buslogic"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_SCSI_BUSLOGIC 1
 EOF
 
@@ -1786,6 +1853,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_scsi_files"
 fi
+fi
 
 fi
 
@@ -1803,7 +1871,8 @@ fi
 # Check whether --enable-u1434f or --disable-u1434f was given.
 if test "${enable_u1434f+set}" = set; then
   enableval="$enable_u1434f"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_SCSI_U14_34F 1
 EOF
 
@@ -1816,6 +1885,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_scsi_files"
 fi
+fi
 
 fi
 
@@ -1833,7 +1903,8 @@ fi
 # Check whether --enable-ultrastor or --disable-ultrastor was given.
 if test "${enable_ultrastor+set}" = set; then
   enableval="$enable_ultrastor"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_SCSI_ULTRASTOR 1
 EOF
 
@@ -1846,6 +1917,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_scsi_files"
 fi
+fi
 
 fi
 
@@ -1863,7 +1935,8 @@ fi
 # Check whether --enable-aha152x or --disable-aha152x was given.
 if test "${enable_aha152x+set}" = set; then
   enableval="$enable_aha152x"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_SCSI_AHA152X 1
 EOF
 
@@ -1876,6 +1949,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_scsi_files"
 fi
+fi
 
 fi
 
@@ -1893,7 +1967,8 @@ fi
 # Check whether --enable-aha1542 or --disable-aha1542 was given.
 if test "${enable_aha1542+set}" = set; then
   enableval="$enable_aha1542"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_SCSI_AHA1542 1
 EOF
 
@@ -1906,6 +1981,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_scsi_files"
 fi
+fi
 
 fi
 
@@ -1923,7 +1999,8 @@ fi
 # Check whether --enable-aha1740 or --disable-aha1740 was given.
 if test "${enable_aha1740+set}" = set; then
   enableval="$enable_aha1740"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_SCSI_AHA1740 1
 EOF
 
@@ -1936,6 +2013,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_scsi_files"
 fi
+fi
 
 fi
 
@@ -1953,7 +2031,8 @@ fi
 # Check whether --enable-aic7xxx or --disable-aic7xxx was given.
 if test "${enable_aic7xxx+set}" = set; then
   enableval="$enable_aic7xxx"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_SCSI_AIC7XXX 1
 EOF
 
@@ -1966,6 +2045,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_scsi_files"
 fi
+fi
 
 fi
 
@@ -1983,7 +2063,8 @@ fi
 # Check whether --enable-futuredomain or --disable-futuredomain was given.
 if test "${enable_futuredomain+set}" = set; then
   enableval="$enable_futuredomain"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_SCSI_FUTURE_DOMAIN 1
 EOF
 
@@ -1996,6 +2077,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_scsi_files"
 fi
+fi
 
 fi
 
@@ -2013,7 +2095,8 @@ fi
 # Check whether --enable-in2000 or --disable-in2000 was given.
 if test "${enable_in2000+set}" = set; then
   enableval="$enable_in2000"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_SCSI_IN2000 1
 EOF
 
@@ -2026,6 +2109,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_scsi_files"
 fi
+fi
 
 fi
 
@@ -2043,7 +2127,8 @@ fi
 # Check whether --enable-ncr5380 or --disable-ncr5380 was given.
 if test "${enable_ncr5380+set}" = set; then
   enableval="$enable_ncr5380"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_SCSI_GENERIC_NCR5380 1
 EOF
 
@@ -2056,6 +2141,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_scsi_files"
 fi
+fi
 
 fi
 
@@ -2073,7 +2159,8 @@ fi
 # Check whether --enable-ncr53c406a or --disable-ncr53c406a was given.
 if test "${enable_ncr53c406a+set}" = set; then
   enableval="$enable_ncr53c406a"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_SCSI_NCR53C406A 1
 EOF
 
@@ -2086,6 +2173,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_scsi_files"
 fi
+fi
 
 fi
 
@@ -2103,7 +2191,8 @@ fi
 # Check whether --enable-pas16 or --disable-pas16 was given.
 if test "${enable_pas16+set}" = set; then
   enableval="$enable_pas16"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_SCSI_PASS16 1
 EOF
 
@@ -2116,6 +2205,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_scsi_files"
 fi
+fi
 
 fi
 
@@ -2133,7 +2223,8 @@ fi
 # Check whether --enable-seagate or --disable-seagate was given.
 if test "${enable_seagate+set}" = set; then
   enableval="$enable_seagate"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_SCSI_SEAGATE 1
 EOF
 
@@ -2146,6 +2237,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_scsi_files"
 fi
+fi
 
 fi
 
@@ -2163,7 +2255,8 @@ fi
 # Check whether --enable-t128 or --disable-t128 was given.
 if test "${enable_t128+set}" = set; then
   enableval="$enable_t128"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_SCSI_T128 1
 EOF
 
@@ -2176,6 +2269,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_scsi_files"
 fi
+fi
 
 fi
 
@@ -2193,7 +2287,8 @@ fi
 # Check whether --enable-ncr53c7xx or --disable-ncr53c7xx was given.
 if test "${enable_ncr53c7xx+set}" = set; then
   enableval="$enable_ncr53c7xx"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_SCSI_NCR53C7xx 1
 EOF
 
@@ -2206,6 +2301,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_scsi_files"
 fi
+fi
 
 fi
 
@@ -2223,7 +2319,8 @@ fi
 # Check whether --enable-eatadma or --disable-eatadma was given.
 if test "${enable_eatadma+set}" = set; then
   enableval="$enable_eatadma"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_SCSI_EATA_DMA 1
 EOF
 
@@ -2236,6 +2333,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_scsi_files"
 fi
+fi
 
 fi
 
@@ -2253,7 +2351,8 @@ fi
 # Check whether --enable-eatapio or --disable-eatapio was given.
 if test "${enable_eatapio+set}" = set; then
   enableval="$enable_eatapio"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_SCSI_EATA_PIO 1
 EOF
 
@@ -2266,6 +2365,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_scsi_files"
 fi
+fi
 
 fi
 
@@ -2283,7 +2383,8 @@ fi
 # Check whether --enable-wd7000 or --disable-wd7000 was given.
 if test "${enable_wd7000+set}" = set; then
   enableval="$enable_wd7000"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_SCSI_7000FASST 1
 EOF
 
@@ -2296,6 +2397,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_scsi_files"
 fi
+fi
 
 fi
 
@@ -2313,7 +2415,8 @@ fi
 # Check whether --enable-eata or --disable-eata was given.
 if test "${enable_eata+set}" = set; then
   enableval="$enable_eata"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_SCSI_EATA 1
 EOF
 
@@ -2326,6 +2429,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_scsi_files"
 fi
+fi
 
 fi
 
@@ -2343,7 +2447,8 @@ fi
 # Check whether --enable-am53c974 or --disable-am53c974 was given.
 if test "${enable_am53c974+set}" = set; then
   enableval="$enable_am53c974"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_SCSI_AM53C974 1
 EOF
 
@@ -2356,6 +2461,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_scsi_files"
 fi
+fi
 
 fi
 
@@ -2373,7 +2479,8 @@ fi
 # Check whether --enable-dtc3280 or --disable-dtc3280 was given.
 if test "${enable_dtc3280+set}" = set; then
   enableval="$enable_dtc3280"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_SCSI_DTC3280 1
 EOF
 
@@ -2386,6 +2493,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_scsi_files"
 fi
+fi
 
 fi
 
@@ -2403,7 +2511,8 @@ fi
 # Check whether --enable-ncr53c8xx or --disable-ncr53c8xx was given.
 if test "${enable_ncr53c8xx+set}" = set; then
   enableval="$enable_ncr53c8xx"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_SCSI_NCR53C8XX 1
 EOF
 
@@ -2416,35 +2525,6 @@ EOF
 
   device_drivers="$device_drivers $driver_class_scsi_files"
 fi
-
-fi
-
-
-# Checking for alias tmscsiw
-# Check whether --enable-tmscsiw or --disable-tmscsiw was given.
-if test "${enable_tmscsiw+set}" = set; then
-  enableval="$enable_tmscsiw"
-  enable_dc390w="$enable_tmscsiw"
-
-fi
-
-
-# Checking for device driver option dc390w
-# Check whether --enable-dc390w or --disable-dc390w was given.
-if test "${enable_dc390w+set}" = set; then
-  enableval="$enable_dc390w"
-  cat >> confdefs.h <<\EOF
-#define CONFIG_SCSI_DC390W 1
-EOF
-
-device_drivers="$device_drivers tmscsiw.o"
-if test "${driver_class_scsi_selected+set}" != set; then
-  driver_class_scsi_selected=yes
-  cat >> confdefs.h <<EOF
-#define $driver_class_scsi_option 1
-EOF
-
-  device_drivers="$device_drivers $driver_class_scsi_files"
 fi
 
 fi
@@ -2463,7 +2543,8 @@ fi
 # Check whether --enable-dc390t or --disable-dc390t was given.
 if test "${enable_dc390t+set}" = set; then
   enableval="$enable_dc390t"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_SCSI_DC390T 1
 EOF
 
@@ -2476,6 +2557,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_scsi_files"
 fi
+fi
 
 fi
 
@@ -2493,7 +2575,8 @@ fi
 # Check whether --enable-ppa or --disable-ppa was given.
 if test "${enable_ppa+set}" = set; then
   enableval="$enable_ppa"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_SCSI_PPA 1
 EOF
 
@@ -2506,6 +2589,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_scsi_files"
 fi
+fi
 
 fi
 
@@ -2523,7 +2607,8 @@ fi
 # Check whether --enable-qlogicfas or --disable-qlogicfas was given.
 if test "${enable_qlogicfas+set}" = set; then
   enableval="$enable_qlogicfas"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_SCSI_QLOGIC_FAS 1
 EOF
 
@@ -2536,6 +2621,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_scsi_files"
 fi
+fi
 
 fi
 
@@ -2553,7 +2639,8 @@ fi
 # Check whether --enable-qlogicisp or --disable-qlogicisp was given.
 if test "${enable_qlogicisp+set}" = set; then
   enableval="$enable_qlogicisp"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_SCSI_QLOGIC_ISP 1
 EOF
 
@@ -2566,6 +2653,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_scsi_files"
 fi
+fi
 
 fi
 
@@ -2583,7 +2671,8 @@ fi
 # Check whether --enable-gdth or --disable-gdth was given.
 if test "${enable_gdth+set}" = set; then
   enableval="$enable_gdth"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_SCSI_GDTH 1
 EOF
 
@@ -2596,6 +2685,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_scsi_files"
 fi
+fi
 
 fi
 
@@ -2621,7 +2711,8 @@ fi
 # Check whether --enable-ne2000 or --disable-ne2000 was given.
 if test "${enable_ne2000+set}" = set; then
   enableval="$enable_ne2000"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_NE2000 1
 EOF
 
@@ -2634,6 +2725,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -2642,7 +2734,8 @@ fi
 # Check whether --enable-el2 or --disable-el2 was given.
 if test "${enable_el2+set}" = set; then
   enableval="$enable_el2"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_EL2 1
 EOF
 
@@ -2655,6 +2748,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -2672,7 +2766,8 @@ fi
 # Check whether --enable-el3 or --disable-el3 was given.
 if test "${enable_el3+set}" = set; then
   enableval="$enable_el3"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_EL3 1
 EOF
 
@@ -2685,6 +2780,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -2693,7 +2789,8 @@ fi
 # Check whether --enable-wd80x3 or --disable-wd80x3 was given.
 if test "${enable_wd80x3+set}" = set; then
   enableval="$enable_wd80x3"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_WD80x3 1
 EOF
 
@@ -2706,6 +2803,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -2723,7 +2821,8 @@ fi
 # Check whether --enable-el1 or --disable-el1 was given.
 if test "${enable_el1+set}" = set; then
   enableval="$enable_el1"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_EL1 1
 EOF
 
@@ -2736,6 +2835,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -2744,7 +2844,8 @@ fi
 # Check whether --enable-ul or --disable-ul was given.
 if test "${enable_ul+set}" = set; then
   enableval="$enable_ul"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_ULTRA 1
 EOF
 
@@ -2757,6 +2858,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -2765,7 +2867,8 @@ fi
 # Check whether --enable-ul32 or --disable-ul32 was given.
 if test "${enable_ul32+set}" = set; then
   enableval="$enable_ul32"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_ULTRA32 1
 EOF
 
@@ -2778,6 +2881,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -2786,7 +2890,8 @@ fi
 # Check whether --enable-hplanplus or --disable-hplanplus was given.
 if test "${enable_hplanplus+set}" = set; then
   enableval="$enable_hplanplus"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_HPLAN_PLUS 1
 EOF
 
@@ -2799,6 +2904,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -2807,7 +2913,8 @@ fi
 # Check whether --enable-hplan or --disable-hplan was given.
 if test "${enable_hplan+set}" = set; then
   enableval="$enable_hplan"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_HPLAN 1
 EOF
 
@@ -2820,6 +2927,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -2837,7 +2945,8 @@ fi
 # Check whether --enable-vortex or --disable-vortex was given.
 if test "${enable_vortex+set}" = set; then
   enableval="$enable_vortex"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_VORTEX 1
 EOF
 
@@ -2850,6 +2959,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -2867,7 +2977,8 @@ fi
 # Check whether --enable-seeq8005 or --disable-seeq8005 was given.
 if test "${enable_seeq8005+set}" = set; then
   enableval="$enable_seeq8005"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_SEEQ8005 1
 EOF
 
@@ -2880,6 +2991,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -2897,7 +3009,8 @@ fi
 # Check whether --enable-hp100 or --disable-hp100 was given.
 if test "${enable_hp100+set}" = set; then
   enableval="$enable_hp100"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_HP100 1
 EOF
 
@@ -2910,6 +3023,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -2918,7 +3032,8 @@ fi
 # Check whether --enable-ac3200 or --disable-ac3200 was given.
 if test "${enable_ac3200+set}" = set; then
   enableval="$enable_ac3200"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_AC3200 1
 EOF
 
@@ -2931,6 +3046,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -2939,7 +3055,8 @@ fi
 # Check whether --enable-e2100 or --disable-e2100 was given.
 if test "${enable_e2100+set}" = set; then
   enableval="$enable_e2100"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_E2100 1
 EOF
 
@@ -2952,6 +3069,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -2969,7 +3087,8 @@ fi
 # Check whether --enable-at1700 or --disable-at1700 was given.
 if test "${enable_at1700+set}" = set; then
   enableval="$enable_at1700"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_AT1700 1
 EOF
 
@@ -2982,6 +3101,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -2999,7 +3119,8 @@ fi
 # Check whether --enable-eth16i or --disable-eth16i was given.
 if test "${enable_eth16i+set}" = set; then
   enableval="$enable_eth16i"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_ETH16I 1
 EOF
 
@@ -3012,6 +3133,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -3029,7 +3151,8 @@ fi
 # Check whether --enable-znet or --disable-znet was given.
 if test "${enable_znet+set}" = set; then
   enableval="$enable_znet"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_ZNET 1
 EOF
 
@@ -3042,6 +3165,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -3059,7 +3183,8 @@ fi
 # Check whether --enable-eexpress or --disable-eexpress was given.
 if test "${enable_eexpress+set}" = set; then
   enableval="$enable_eexpress"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_EEXPRESS 1
 EOF
 
@@ -3072,6 +3197,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -3089,7 +3215,8 @@ fi
 # Check whether --enable-eexpresspro or --disable-eexpresspro was given.
 if test "${enable_eexpresspro+set}" = set; then
   enableval="$enable_eexpresspro"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_EEXPRESS_PRO 1
 EOF
 
@@ -3102,6 +3229,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -3119,7 +3247,8 @@ fi
 # Check whether --enable-eexpresspro100 or --disable-eexpresspro100 was given.
 if test "${enable_eexpresspro100+set}" = set; then
   enableval="$enable_eexpresspro100"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_EEXPRESS_PRO100B 1
 EOF
 
@@ -3132,6 +3261,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -3149,7 +3279,8 @@ fi
 # Check whether --enable-depca or --disable-depca was given.
 if test "${enable_depca+set}" = set; then
   enableval="$enable_depca"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_DEPCA 1
 EOF
 
@@ -3162,6 +3293,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -3179,7 +3311,8 @@ fi
 # Check whether --enable-ewrk3 or --disable-ewrk3 was given.
 if test "${enable_ewrk3+set}" = set; then
   enableval="$enable_ewrk3"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_EWRK3 1
 EOF
 
@@ -3192,6 +3325,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -3209,7 +3343,8 @@ fi
 # Check whether --enable-de4x5 or --disable-de4x5 was given.
 if test "${enable_de4x5+set}" = set; then
   enableval="$enable_de4x5"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_DE4X5 1
 EOF
 
@@ -3222,6 +3357,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -3239,7 +3375,8 @@ fi
 # Check whether --enable-apricot or --disable-apricot was given.
 if test "${enable_apricot+set}" = set; then
   enableval="$enable_apricot"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_APRICOT 1
 EOF
 
@@ -3252,6 +3389,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -3269,7 +3407,8 @@ fi
 # Check whether --enable-wavelan or --disable-wavelan was given.
 if test "${enable_wavelan+set}" = set; then
   enableval="$enable_wavelan"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_WAVELAN 1
 EOF
 
@@ -3282,6 +3421,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -3299,7 +3439,8 @@ fi
 # Check whether --enable-el16 or --disable-el16 was given.
 if test "${enable_el16+set}" = set; then
   enableval="$enable_el16"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_EL16 1
 EOF
 
@@ -3312,6 +3453,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -3329,7 +3471,8 @@ fi
 # Check whether --enable-elplus or --disable-elplus was given.
 if test "${enable_elplus+set}" = set; then
   enableval="$enable_elplus"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_ELPLUS 1
 EOF
 
@@ -3342,6 +3485,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -3359,7 +3503,8 @@ fi
 # Check whether --enable-de600 or --disable-de600 was given.
 if test "${enable_de600+set}" = set; then
   enableval="$enable_de600"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_DE600 1
 EOF
 
@@ -3372,6 +3517,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -3389,7 +3535,8 @@ fi
 # Check whether --enable-de620 or --disable-de620 was given.
 if test "${enable_de620+set}" = set; then
   enableval="$enable_de620"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_DE620 1
 EOF
 
@@ -3402,6 +3549,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -3419,7 +3567,8 @@ fi
 # Check whether --enable-skg16 or --disable-skg16 was given.
 if test "${enable_skg16+set}" = set; then
   enableval="$enable_skg16"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_SK_G16 1
 EOF
 
@@ -3432,6 +3581,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -3449,7 +3599,8 @@ fi
 # Check whether --enable-ni52 or --disable-ni52 was given.
 if test "${enable_ni52+set}" = set; then
   enableval="$enable_ni52"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_NI52 1
 EOF
 
@@ -3462,6 +3613,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -3479,7 +3631,8 @@ fi
 # Check whether --enable-ni65 or --disable-ni65 was given.
 if test "${enable_ni65+set}" = set; then
   enableval="$enable_ni65"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_NI65 1
 EOF
 
@@ -3492,6 +3645,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -3509,7 +3663,8 @@ fi
 # Check whether --enable-atp or --disable-atp was given.
 if test "${enable_atp+set}" = set; then
   enableval="$enable_atp"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_ATP 1
 EOF
 
@@ -3522,6 +3677,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -3539,7 +3695,8 @@ fi
 # Check whether --enable-lance or --disable-lance was given.
 if test "${enable_lance+set}" = set; then
   enableval="$enable_lance"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_LANCE 1
 EOF
 
@@ -3552,6 +3709,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -3569,7 +3727,8 @@ fi
 # Check whether --enable-elcp or --disable-elcp was given.
 if test "${enable_elcp+set}" = set; then
   enableval="$enable_elcp"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_DEC_ELCP 1
 EOF
 
@@ -3582,6 +3741,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -3599,7 +3759,8 @@ fi
 # Check whether --enable-fmv18x or --disable-fmv18x was given.
 if test "${enable_fmv18x+set}" = set; then
   enableval="$enable_fmv18x"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_FMV18X 1
 EOF
 
@@ -3612,6 +3773,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -3629,7 +3791,8 @@ fi
 # Check whether --enable-3c515 or --disable-3c515 was given.
 if test "${enable_3c515+set}" = set; then
   enableval="$enable_3c515"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_3C515 1
 EOF
 
@@ -3642,6 +3805,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -3659,7 +3823,8 @@ fi
 # Check whether --enable-pcnet32 or --disable-pcnet32 was given.
 if test "${enable_pcnet32+set}" = set; then
   enableval="$enable_pcnet32"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_PCNET32 1
 EOF
 
@@ -3672,6 +3837,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -3680,7 +3846,8 @@ fi
 # Check whether --enable-ne2kpci or --disable-ne2kpci was given.
 if test "${enable_ne2kpci+set}" = set; then
   enableval="$enable_ne2kpci"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_NE2K_PCI 1
 EOF
 
@@ -3693,6 +3860,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -3710,7 +3878,8 @@ fi
 # Check whether --enable-yellowfin or --disable-yellowfin was given.
 if test "${enable_yellowfin+set}" = set; then
   enableval="$enable_yellowfin"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_YELLOWFIN 1
 EOF
 
@@ -3723,6 +3892,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -3740,7 +3910,8 @@ fi
 # Check whether --enable-rtl8139 or --disable-rtl8139 was given.
 if test "${enable_rtl8139+set}" = set; then
   enableval="$enable_rtl8139"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_RTL8139 1
 EOF
 
@@ -3753,6 +3924,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -3770,7 +3942,8 @@ fi
 # Check whether --enable-epic or --disable-epic was given.
 if test "${enable_epic+set}" = set; then
   enableval="$enable_epic"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_EPIC 1
 EOF
 
@@ -3783,6 +3956,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -3800,7 +3974,8 @@ fi
 # Check whether --enable-tlan or --disable-tlan was given.
 if test "${enable_tlan+set}" = set; then
   enableval="$enable_tlan"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_TLAN 1
 EOF
 
@@ -3813,6 +3988,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -3830,7 +4006,8 @@ fi
 # Check whether --enable-viarhine or --disable-viarhine was given.
 if test "${enable_viarhine+set}" = set; then
   enableval="$enable_viarhine"
-  cat >> confdefs.h <<\EOF
+  if test "x$enableval" != xno; then
+cat >> confdefs.h <<\EOF
 #define CONFIG_VIA_RHINE 1
 EOF
 
@@ -3843,6 +4020,7 @@ EOF
 
   device_drivers="$device_drivers $driver_class_net_files"
 fi
+fi
 
 fi
 
@@ -3869,7 +4047,7 @@ EOF
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 (set) 2>&1 |
-  case `(ac_space=' '; set) 2>&1` in
+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
   *ac_space=\ *)
     # `set' does not quote correctly, so add quotes (double-quote substitution
     # turns \\\\ into \\, and sed turns \\ into \).
@@ -3936,7 +4114,7 @@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.12"
+    echo "$CONFIG_STATUS generated by autoconf version 2.13.1"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -3955,9 +4133,11 @@ sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
  s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
 $ac_vpsub
 $extrasub
+s%@SHELL@%$SHELL%g
 s%@CFLAGS@%$CFLAGS%g
 s%@CPPFLAGS@%$CPPFLAGS%g
 s%@CXXFLAGS@%$CXXFLAGS%g
+s%@FFLAGS@%$FFLAGS%g
 s%@DEFS@%$DEFS%g
 s%@LDFLAGS@%$LDFLAGS%g
 s%@LIBS@%$LIBS%g
@@ -4072,7 +4252,7 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
   rm -f "$ac_file"
   configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
   case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
+  *[Mm]akefile*) ac_comsub="1i\\
 # $configure_input" ;;
   *) ac_comsub= ;;
   esac
@@ -4203,5 +4383,5 @@ exit 0
 EOF
 chmod +x $CONFIG_STATUS
 rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+test "$no_create" = yes || $SHELL $CONFIG_STATUS || exit 1
 
diff --git a/i386/linux/device-drivers.h.in b/i386/linux/device-drivers.h.in
index 7cb7df8..e0469c0 100644
--- a/i386/linux/device-drivers.h.in
+++ b/i386/linux/device-drivers.h.in
@@ -33,7 +33,6 @@
 #undef CONFIG_SCSI_AM53C974
 #undef CONFIG_SCSI_DTC3280
 #undef CONFIG_SCSI_NCR53C8XX
-#undef CONFIG_SCSI_DC390W
 #undef CONFIG_SCSI_DC390T
 #undef CONFIG_SCSI_PPA
 #undef CONFIG_SCSI_QLOGIC_FAS