Merge with Linux 2.3.21.

1 files changed, 272 insertions, 272 deletions

diff --git a/arch/m68k/config.in b/arch/m68k/config.in
index 54e8448d3..a458ff609 100644
--- a/arch/m68k/config.in
+++ b/arch/m68k/config.in
@@ -10,40 +10,31 @@ bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL
 endmenu
 
 mainmenu_option next_comment
-comment 'Loadable module support'
-bool 'Enable loadable module support' CONFIG_MODULES
-if [ "$CONFIG_MODULES" = "y" ]; then
-  bool 'Set version information on all symbols for modules' CONFIG_MODVERSIONS
-  bool 'Kernel module loader' CONFIG_KMOD
-fi
-endmenu
-
-mainmenu_option next_comment
 comment 'Platform dependent setup'
 
 bool 'Amiga support' CONFIG_AMIGA
 bool 'Atari support' CONFIG_ATARI
 if [ "$CONFIG_ATARI" = "y" ]; then
-  bool '  Hades support' CONFIG_HADES
-  if [ "$CONFIG_HADES" = "y" ]; then
-    define_bool CONFIG_PCI y
-  fi  
+   bool '  Hades support' CONFIG_HADES
+   if [ "$CONFIG_HADES" = "y" ]; then
+      define_bool CONFIG_PCI y
+   fi  
 fi
 bool 'Macintosh support' CONFIG_MAC
 if [ "$CONFIG_MAC" = "y" ]; then
-  define_bool CONFIG_NUBUS y
-  define_bool CONFIG_M68K_L2_CACHE y
+   define_bool CONFIG_NUBUS y
+   define_bool CONFIG_M68K_L2_CACHE y
 fi
 bool 'Apollo support' CONFIG_APOLLO
 bool 'VME (Motorola and BVM) support' CONFIG_VME
 if [ "$CONFIG_VME" = "y" ]; then
-  bool 'MVME147 support' CONFIG_MVME147
-  bool 'MVME162, 166 and 167 support' CONFIG_MVME16x
-  bool 'BVME4000 and BVME6000 support' CONFIG_BVME6000
+   bool '  MVME147 support' CONFIG_MVME147
+   bool '  MVME162, 166 and 167 support' CONFIG_MVME16x
+   bool '  BVME4000 and BVME6000 support' CONFIG_BVME6000
 fi
 bool 'HP9000/300 support' CONFIG_HP300
 if [ "$CONFIG_HP300" = "y" ]; then
-  bool 'DIO bus support' CONFIG_DIO
+   bool '  DIO bus support' CONFIG_DIO
 fi
 bool 'Sun3x support' CONFIG_SUN3X
   
@@ -56,19 +47,19 @@ bool '68030 support' CONFIG_M68030
 bool '68040 support' CONFIG_M68040
 bool '68060 support' CONFIG_M68060
 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-  bool 'Math emulation support' CONFIG_M68KFPU_EMU
-  if [ "$CONFIG_M68KFPU_EMU" = "y" ]; then
-    bool 'Math emulation extra precision' CONFIG_M68KFPU_EMU_EXTRAPREC
-    bool 'Math emulation only kernel' CONFIG_M68KFPU_EMU_ONLY
-  fi
+   bool 'Math emulation support (EXPERIMENTAL)' CONFIG_M68KFPU_EMU
+   if [ "$CONFIG_M68KFPU_EMU" = "y" ]; then
+      bool '  Math emulation extra precision' CONFIG_M68KFPU_EMU_EXTRAPREC
+      bool '  Math emulation only kernel' CONFIG_M68KFPU_EMU_ONLY
+   fi
 fi
 bool 'Advanced configuration options' CONFIG_ADVANCED
 if [ "$CONFIG_ADVANCED" = "y" ]; then
-  bool 'Use read-modify-write instructions' CONFIG_RMW_INSNS
-  bool 'Use one physical chunk of memory only' CONFIG_SINGLE_MEMORY_CHUNK
-  if [ "$CONFIG_M68060" = "y" ]; then
-    bool 'Use write-through caching for 68060 supervisor accesses' CONFIG_060_WRITETHROUGH
-  fi
+   bool 'Use read-modify-write instructions' CONFIG_RMW_INSNS
+   bool 'Use one physical chunk of memory only' CONFIG_SINGLE_MEMORY_CHUNK
+   if [ "$CONFIG_M68060" = "y" ]; then
+      bool 'Use write-through caching for 68060 supervisor accesses' CONFIG_060_WRITETHROUGH
+   fi
 fi
 endmenu
 
@@ -86,55 +77,64 @@ tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
 if [ "$CONFIG_AMIGA" = "y" ]; then
   bool 'Amiga Zorro (AutoConfig) bus support' CONFIG_ZORRO
   if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-    bool 'Amiga 1200/600 PCMCIA support' CONFIG_AMIGA_PCMCIA
+     bool 'Amiga 1200/600 PCMCIA support (EXPERIMENTAL)' CONFIG_AMIGA_PCMCIA
   fi
 fi
 if [ "$CONFIG_ATARI" = "y" ]; then
-  bool 'Support for ST-RAM as swap space' CONFIG_STRAM_SWAP
-  bool 'ST-RAM statistics in /proc' CONFIG_STRAM_PROC
+   bool 'Support for ST-RAM as swap space' CONFIG_STRAM_SWAP
+   bool 'ST-RAM statistics in /proc' CONFIG_STRAM_PROC
 fi
 if [ "$CONFIG_AMIGA" = "y" -o "$CONFIG_ATARI" = "y" ]; then
-  bool 'Use power LED as a heartbeat' CONFIG_HEARTBEAT
+   bool 'Use power LED as a heartbeat' CONFIG_HEARTBEAT
 else
   if [ "$CONFIG_HP300" = "y" ]; then
-# We have a dedicated heartbeat LED. :-)
-  define_bool CONFIG_HEARTBEAT y
+     # We have a dedicated heartbeat LED. :-)
+     define_bool CONFIG_HEARTBEAT y
   fi
 fi
 bool '/proc/hardware support' CONFIG_PROC_HARDWARE
 
 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-  tristate 'Parallel port support (EXPERIMENTAL)' CONFIG_PARPORT
-  if [ "$CONFIG_PARPORT" != "n" ]; then
-    if [ "$CONFIG_AMIGA" != "n" ]; then
-      dep_tristate '   Amiga builtin port' CONFIG_PARPORT_AMIGA $CONFIG_PARPORT
-      if [ "$CONFIG_ZORRO" != "n" ]; then
-        dep_tristate '    Multiface III parallel port' CONFIG_PARPORT_MFC3 $CONFIG_PARPORT
+   tristate 'Parallel port support (EXPERIMENTAL)' CONFIG_PARPORT
+   if [ "$CONFIG_PARPORT" != "n" ]; then
+      if [ "$CONFIG_AMIGA" != "n" ]; then
+         dep_tristate '   Amiga builtin port' CONFIG_PARPORT_AMIGA $CONFIG_PARPORT
+	 if [ "$CONFIG_ZORRO" != "n" ]; then
+            dep_tristate '    Multiface III parallel port' CONFIG_PARPORT_MFC3 $CONFIG_PARPORT
+	 fi
       fi
-    fi
-    if [ "$CONFIG_Q40" != "n" ]; then
-       tristate '    Q40 Parallel port' CONFIG_PARPORT
-       if [ "$CONFIG_PARPORT" != "n" ]; then
-         define_bool CONFIG_PARPORT_PC y
-       fi
-    fi
-  fi
-  if [ "$CONFIG_ATARI" == "y" ]; then
-    dep_tristate '    Atari builtin port' CONFIG_PARPORT_ATARI $CONFIG_PARPORT
-  fi
-  dep_tristate 'Parallel printer support' CONFIG_PRINTER $CONFIG_PARPORT
-  if [ "$CONFIG_PRINTER" != "n" ]; then
-    bool '  Support IEEE1284 status readback' CONFIG_PRINTER_READBACK
-  fi
+      if [ "$CONFIG_Q40" != "n" ]; then
+	 tristate '    Q40 Parallel port' CONFIG_PARPORT
+	 if [ "$CONFIG_PARPORT" != "n" ]; then
+	    define_bool CONFIG_PARPORT_PC y
+	 fi
+      fi
+   fi
+   if [ "$CONFIG_ATARI" = "y" ]; then
+      dep_tristate '  Atari builtin port' CONFIG_PARPORT_ATARI $CONFIG_PARPORT
+   fi
+   dep_tristate '  Parallel printer support' CONFIG_PRINTER $CONFIG_PARPORT
+   if [ "$CONFIG_PRINTER" != "n" ]; then
+      bool '    Support IEEE1284 status readback' CONFIG_PRINTER_READBACK
+   fi
 fi
 
 
 endmenu
 
+mainmenu_option next_comment
+comment 'Loadable module support'
+bool 'Enable loadable module support' CONFIG_MODULES
+if [ "$CONFIG_MODULES" = "y" ]; then
+   bool '  Set version information on all symbols for modules' CONFIG_MODVERSIONS
+   bool '  Kernel module loader' CONFIG_KMOD
+fi
+endmenu
+
 source drivers/block/Config.in
 
 if [ "$CONFIG_NET" = "y" ]; then
-  source net/Config.in
+   source net/Config.in
 fi
 
 mainmenu_option next_comment
@@ -144,154 +144,154 @@ tristate 'SCSI support' CONFIG_SCSI
 
 if [ "$CONFIG_SCSI" != "n" ]; then
 
-comment 'SCSI support type (disk, tape, CD-ROM)'
+   comment 'SCSI support type (disk, tape, CD-ROM)'
 
-dep_tristate 'SCSI disk support' CONFIG_BLK_DEV_SD $CONFIG_SCSI
-dep_tristate 'SCSI tape support' CONFIG_CHR_DEV_ST $CONFIG_SCSI
-dep_tristate 'SCSI CD-ROM support' CONFIG_BLK_DEV_SR $CONFIG_SCSI
-if [ "$CONFIG_BLK_DEV_SR" != "n" ]; then
-  bool '  Enable vendor-specific extensions (for SCSI CDROM)' CONFIG_BLK_DEV_SR_VENDOR
-fi
-dep_tristate 'SCSI generic support' CONFIG_CHR_DEV_SG $CONFIG_SCSI
+   dep_tristate '  SCSI disk support' CONFIG_BLK_DEV_SD $CONFIG_SCSI
+   dep_tristate '  SCSI tape support' CONFIG_CHR_DEV_ST $CONFIG_SCSI
+   dep_tristate '  SCSI CD-ROM support' CONFIG_BLK_DEV_SR $CONFIG_SCSI
+   if [ "$CONFIG_BLK_DEV_SR" != "n" ]; then
+      bool '    Enable vendor-specific extensions (for SCSI CDROM)' CONFIG_BLK_DEV_SR_VENDOR
+   fi
+   dep_tristate '  SCSI generic support' CONFIG_CHR_DEV_SG $CONFIG_SCSI
 
-comment 'Some SCSI devices (e.g. CD jukebox) support multiple LUNs'
+   comment 'Some SCSI devices (e.g. CD jukebox) support multiple LUNs'
 
-bool 'Probe all LUNs on each SCSI device' CONFIG_SCSI_MULTI_LUN
+   bool '  Probe all LUNs on each SCSI device' CONFIG_SCSI_MULTI_LUN
 
-bool 'Verbose SCSI error reporting (kernel size +=12K)' CONFIG_SCSI_CONSTANTS
-bool 'SCSI logging facility' CONFIG_SCSI_LOGGING
+   bool '  Verbose SCSI error reporting (kernel size +=12K)' CONFIG_SCSI_CONSTANTS
+   bool '  SCSI logging facility' CONFIG_SCSI_LOGGING
 
-mainmenu_option next_comment
-comment 'SCSI low-level drivers'
+   mainmenu_option next_comment
+   comment 'SCSI low-level drivers'
 
-if [ "$CONFIG_AMIGA" = "y" ]; then
-  dep_tristate 'A3000 WD33C93A support' CONFIG_A3000_SCSI $CONFIG_SCSI
-  if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-    bool 'A4000T SCSI support' CONFIG_A4000T_SCSI
-  fi
-fi
-if [ "$CONFIG_ZORRO" = "y" ]; then
-  dep_tristate 'A2091 WD33C93A support' CONFIG_A2091_SCSI $CONFIG_SCSI
-  dep_tristate 'GVP Series II WD33C93A support' CONFIG_GVP11_SCSI $CONFIG_SCSI
-  dep_tristate 'CyberStorm SCSI support' CONFIG_CYBERSTORM_SCSI $CONFIG_SCSI
-  dep_tristate 'CyberStorm Mk II SCSI support' CONFIG_CYBERSTORMII_SCSI $CONFIG_SCSI
-  dep_tristate 'Blizzard 2060 SCSI support' CONFIG_BLZ2060_SCSI $CONFIG_SCSI
-  dep_tristate 'Blizzard 1230IV/1260 SCSI support' CONFIG_BLZ1230_SCSI $CONFIG_SCSI
-  dep_tristate 'Fastlane SCSI support' CONFIG_FASTLANE_SCSI $CONFIG_SCSI
-  if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-    bool 'A4091 SCSI support' CONFIG_A4091_SCSI
-    bool 'WarpEngine SCSI support' CONFIG_WARPENGINE_SCSI
-    bool 'Blizzard PowerUP 603e+ SCSI' CONFIG_BLZ603EPLUS_SCSI
-    dep_tristate 'BSC Oktagon SCSI support' CONFIG_OKTAGON_SCSI $CONFIG_SCSI
-    bool 'Cyberstorm Mk III SCSI support' CONFIG_CYBERSTORMIII_SCSI
-#    bool 'GVP Turbo 040/060 SCSI support' CONFIG_GVP_TURBO_SCSI
-  fi
-fi
-if [ "$CONFIG_ATARI" = "y" ]; then
-  dep_tristate 'Atari native SCSI support' CONFIG_ATARI_SCSI $CONFIG_SCSI
-  if [ "$CONFIG_ATARI_SCSI" != "n" ]; then
-    bool '  Long delays for Toshiba CD-ROMs' CONFIG_ATARI_SCSI_TOSHIBA_DELAY
-    bool '  Reset SCSI-devices at boottime' CONFIG_ATARI_SCSI_RESET_BOOT
-    if [ "$CONFIG_EXPERIMENTAL" = "y" -a "$CONFIG_HADES" = "y" ]; then
-      bool '  Hades SCSI DMA emulator (EXPERIMENTAL)' CONFIG_TT_DMA_EMUL
-    fi
-  fi
-fi
-if [ "$CONFIG_MAC" = "y" ]; then
-  bool 'Macintosh NCR5380 SCSI' CONFIG_MAC_SCSI
-  dep_tristate 'Macintosh NCR53c9[46] SCSI' CONFIG_SCSI_MAC_ESP $CONFIG_SCSI
-fi
-#dep_tristate 'SCSI debugging host adapter' CONFIG_SCSI_DEBUG $CONFIG_SCSI
+   if [ "$CONFIG_AMIGA" = "y" ]; then
+      dep_tristate 'A3000 WD33C93A support' CONFIG_A3000_SCSI $CONFIG_SCSI
+      if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+	 bool 'A4000T SCSI support (EXPERIMENTAL)' CONFIG_A4000T_SCSI
+      fi
+   fi
+   if [ "$CONFIG_ZORRO" = "y" ]; then
+      dep_tristate 'A2091 WD33C93A support' CONFIG_A2091_SCSI $CONFIG_SCSI
+      dep_tristate 'GVP Series II WD33C93A support' CONFIG_GVP11_SCSI $CONFIG_SCSI
+      dep_tristate 'CyberStorm SCSI support' CONFIG_CYBERSTORM_SCSI $CONFIG_SCSI
+      dep_tristate 'CyberStorm Mk II SCSI support' CONFIG_CYBERSTORMII_SCSI $CONFIG_SCSI
+      dep_tristate 'Blizzard 2060 SCSI support' CONFIG_BLZ2060_SCSI $CONFIG_SCSI
+      dep_tristate 'Blizzard 1230IV/1260 SCSI support' CONFIG_BLZ1230_SCSI $CONFIG_SCSI
+      dep_tristate 'Fastlane SCSI support' CONFIG_FASTLANE_SCSI $CONFIG_SCSI
+      if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+	 bool 'A4091 SCSI support (EXPERIMENTAL)' CONFIG_A4091_SCSI
+	 bool 'WarpEngine SCSI support (EXPERIMENTAL)' CONFIG_WARPENGINE_SCSI
+	 bool 'Blizzard PowerUP 603e+ SCSI (EXPERIMENTAL)' CONFIG_BLZ603EPLUS_SCSI
+	 dep_tristate 'BSC Oktagon SCSI support (EXPERIMENTAL)' CONFIG_OKTAGON_SCSI $CONFIG_SCSI
+	 bool 'Cyberstorm Mk III SCSI support (EXPERIMENTAL)' CONFIG_CYBERSTORMIII_SCSI
+#	 bool 'GVP Turbo 040/060 SCSI support (EXPERIMENTAL)' CONFIG_GVP_TURBO_SCSI
+      fi
+   fi
+   if [ "$CONFIG_ATARI" = "y" ]; then
+      dep_tristate 'Atari native SCSI support' CONFIG_ATARI_SCSI $CONFIG_SCSI
+      if [ "$CONFIG_ATARI_SCSI" != "n" ]; then
+	 bool '  Long delays for Toshiba CD-ROMs' CONFIG_ATARI_SCSI_TOSHIBA_DELAY
+	 bool '  Reset SCSI-devices at boottime' CONFIG_ATARI_SCSI_RESET_BOOT
+	 if [ "$CONFIG_EXPERIMENTAL" = "y" -a "$CONFIG_HADES" = "y" ]; then
+	    bool '  Hades SCSI DMA emulator (EXPERIMENTAL)' CONFIG_TT_DMA_EMUL
+	 fi
+      fi
+   fi
+   if [ "$CONFIG_MAC" = "y" ]; then
+      bool 'Macintosh NCR5380 SCSI' CONFIG_MAC_SCSI
+      dep_tristate 'Macintosh NCR53c9[46] SCSI' CONFIG_SCSI_MAC_ESP $CONFIG_SCSI
+   fi
+#   dep_tristate 'SCSI debugging host adapter' CONFIG_SCSI_DEBUG $CONFIG_SCSI
 
-if [ "$CONFIG_VME" = "y" -a "$CONFIG_MVME147" = "y" ]; then
-  bool 'WD33C93 SCSI driver for MVME147' CONFIG_MVME147_SCSI
-fi
+   if [ "$CONFIG_VME" = "y" -a "$CONFIG_MVME147" = "y" ]; then
+      bool 'WD33C93 SCSI driver for MVME147' CONFIG_MVME147_SCSI
+   fi
 
-if [ "$CONFIG_VME" = "y" -a "$CONFIG_MVME16x" = "y" ]; then
-  bool 'NCR53C710 SCSI driver for MVME16x' CONFIG_MVME16x_SCSI
-fi
+   if [ "$CONFIG_VME" = "y" -a "$CONFIG_MVME16x" = "y" ]; then
+      bool 'NCR53C710 SCSI driver for MVME16x' CONFIG_MVME16x_SCSI
+   fi
 
-if [ "$CONFIG_VME" = "y" -a "$CONFIG_BVME6000" = "y" ]; then
-  bool 'NCR53C710 SCSI driver for BVME6000' CONFIG_BVME6000_SCSI
-fi
+   if [ "$CONFIG_VME" = "y" -a "$CONFIG_BVME6000" = "y" ]; then
+      bool 'NCR53C710 SCSI driver for BVME6000' CONFIG_BVME6000_SCSI
+   fi
 
-if [ "$CONFIG_SUN3X" = "y" ]; then
-  bool 'ESP SCSI driver' CONFIG_SUN3X_ESP
-fi
+   if [ "$CONFIG_SUN3X" = "y" ]; then
+      bool 'ESP SCSI driver' CONFIG_SUN3X_ESP
+   fi
 
-endmenu
+   endmenu
 
 fi
 endmenu
 
 if [ "$CONFIG_NET" = "y" ]; then
 
-mainmenu_option next_comment
-comment 'Network device support'
-
-bool 'Network device support' CONFIG_NETDEVICES
-if [ "$CONFIG_NETDEVICES" = "y" ]; then
-#
-# Network device configuration
-#
-tristate 'Dummy net driver support' CONFIG_DUMMY
-tristate 'SLIP (serial line) support' CONFIG_SLIP
-if [ "$CONFIG_SLIP" != "n" ]; then
-  bool ' CSLIP compressed headers' CONFIG_SLIP_COMPRESSED
-  bool ' Keepalive and linefill' CONFIG_SLIP_SMART
-  bool ' Six bit SLIP encapsulation' CONFIG_SLIP_MODE_SLIP6
-fi
-tristate 'PPP (point-to-point) support' CONFIG_PPP
-if [ ! "$CONFIG_PPP" = "n" ]; then
-  comment 'CCP compressors for PPP are only built as modules.'
-fi
-tristate 'EQL (serial line load balancing) support' CONFIG_EQUALIZER
-if [ "$CONFIG_ZORRO" = "y" ]; then
-  tristate 'Ariadne support' CONFIG_ARIADNE
-  tristate 'Ariadne II support' CONFIG_ARIADNE2
-  tristate 'A2065 support' CONFIG_A2065
-  tristate 'Hydra support' CONFIG_HYDRA
-fi
-if [ "$CONFIG_AMIGA_PCMCIA" = "y" ]; then
-  tristate 'PCMCIA NE2000 support' CONFIG_APNE
-fi
-if [ "$CONFIG_APOLLO" = "y" ] ; then
-  tristate 'Apollo 3c505 support' CONFIG_APOLLO_ELPLUS
-fi
-if [ "$CONFIG_MAC" = "y" ]; then
-  bool 'Mac NS 8390 based ethernet cards' CONFIG_DAYNAPORT
-#  bool 'Macintosh (AV) onboard MACE ethernet' CONFIG_MACMACE
-  bool 'Macintosh (Quadra) onboard SONIC ethernet' CONFIG_MACSONIC
-fi
-if [ "$CONFIG_VME" = "y" -a "$CONFIG_MVME147" = "y" ]; then
-  tristate 'MVME147 (Lance) Ethernet support' CONFIG_MVME147_NET
-fi
-if [ "$CONFIG_VME" = "y" -a "$CONFIG_MVME16x" = "y" ]; then
-  tristate 'MVME16x Ethernet support' CONFIG_MVME16x_NET
-fi
-if [ "$CONFIG_VME" = "y" -a "$CONFIG_BVME6000" = "y" ]; then
-  tristate 'BVME6000 Ethernet support' CONFIG_BVME6000_NET
-fi
-if [ "$CONFIG_ATARI" = "y" ]; then
-  tristate 'Atari Lance support' CONFIG_ATARILANCE
-  if [ "$CONFIG_ATARI_ACSI" != "n" ]; then
-    tristate 'BioNet-100 support' CONFIG_ATARI_BIONET
-    tristate 'PAMsNet support' CONFIG_ATARI_PAMSNET
-  fi
-fi
-if [ "$CONFIG_SUN3X" = "y" ]; then
-  bool 'Sun3x Lance support' CONFIG_SUNLANCE
-fi
-if [ "$CONFIG_HP300" = "y" ]; then
-  bool 'HP on-board LANCE support' CONFIG_HPLANCE
-fi
-if [ "$CONFIG_Q40" = "y" ]; then
-  if [ ! "$CONFIG_PARPORT" = "n" ]; then
-    dep_tristate 'PLIP (parallel port) support' CONFIG_PLIP $CONFIG_PARPORT
-  fi
-fi
-fi
-endmenu
+   mainmenu_option next_comment
+   comment 'Network device support'
+
+   bool 'Network device support' CONFIG_NETDEVICES
+   if [ "$CONFIG_NETDEVICES" = "y" ]; then
+      #
+      # Network device configuration
+      #
+      tristate '  Dummy net driver support' CONFIG_DUMMY
+      tristate '  SLIP (serial line) support' CONFIG_SLIP
+      if [ "$CONFIG_SLIP" != "n" ]; then
+	 bool '    CSLIP compressed headers' CONFIG_SLIP_COMPRESSED
+	 bool '    Keepalive and linefill' CONFIG_SLIP_SMART
+	 bool '    Six bit SLIP encapsulation' CONFIG_SLIP_MODE_SLIP6
+      fi
+      tristate '  PPP (point-to-point) support' CONFIG_PPP
+      if [ ! "$CONFIG_PPP" = "n" ]; then
+	 comment 'CCP compressors for PPP are only built as modules.'
+      fi
+      tristate '  EQL (serial line load balancing) support' CONFIG_EQUALIZER
+      if [ "$CONFIG_ZORRO" = "y" ]; then
+	 tristate '  Ariadne support' CONFIG_ARIADNE
+	 tristate '  Ariadne II support' CONFIG_ARIADNE2
+	 tristate '  A2065 support' CONFIG_A2065
+	 tristate '  Hydra support' CONFIG_HYDRA
+      fi
+      if [ "$CONFIG_AMIGA_PCMCIA" = "y" ]; then
+	 tristate '  PCMCIA NE2000 support' CONFIG_APNE
+      fi
+      if [ "$CONFIG_APOLLO" = "y" ]; then
+	 tristate '  Apollo 3c505 support' CONFIG_APOLLO_ELPLUS
+      fi
+      if [ "$CONFIG_MAC" = "y" ]; then
+	 bool '  Mac NS 8390 based ethernet cards' CONFIG_DAYNAPORT
+#	 bool '  Macintosh (AV) onboard MACE ethernet' CONFIG_MACMACE
+	 bool '  Macintosh (Quadra) onboard SONIC ethernet' CONFIG_MACSONIC
+      fi
+      if [ "$CONFIG_VME" = "y" -a "$CONFIG_MVME147" = "y" ]; then
+	 tristate '  MVME147 (Lance) Ethernet support' CONFIG_MVME147_NET
+      fi
+      if [ "$CONFIG_VME" = "y" -a "$CONFIG_MVME16x" = "y" ]; then
+	 tristate '  MVME16x Ethernet support' CONFIG_MVME16x_NET
+      fi
+      if [ "$CONFIG_VME" = "y" -a "$CONFIG_BVME6000" = "y" ]; then
+	 tristate '  BVME6000 Ethernet support' CONFIG_BVME6000_NET
+      fi
+      if [ "$CONFIG_ATARI" = "y" ]; then
+	 tristate '  Atari Lance support' CONFIG_ATARILANCE
+	 if [ "$CONFIG_ATARI_ACSI" != "n" ]; then
+	    tristate '  BioNet-100 support' CONFIG_ATARI_BIONET
+	    tristate '  PAMsNet support' CONFIG_ATARI_PAMSNET
+	 fi
+      fi
+      if [ "$CONFIG_SUN3X" = "y" ]; then
+	 bool '  Sun3x Lance support' CONFIG_SUNLANCE
+      fi
+      if [ "$CONFIG_HP300" = "y" ]; then
+	 bool '  HP on-board LANCE support' CONFIG_HPLANCE
+      fi
+      if [ "$CONFIG_Q40" = "y" ]; then
+	 if [ ! "$CONFIG_PARPORT" = "n" ]; then
+	    dep_tristate '  PLIP (parallel port) support' CONFIG_PLIP $CONFIG_PARPORT
+	 fi
+      fi
+   fi
+   endmenu
 
 fi
 
@@ -303,85 +303,85 @@ if [ "$CONFIG_Q40" = "y" ]; then
 fi
 
 if [ "$CONFIG_SERIAL" = "y" ]; then
-   bool '   Support for console on serial port' CONFIG_SERIAL_CONSOLE
-   bool 'Extended dumb serial driver options' CONFIG_SERIAL_EXTENDED
+   bool '  Support for console on serial port' CONFIG_SERIAL_CONSOLE
+   bool '  Extended dumb serial driver options' CONFIG_SERIAL_EXTENDED
 fi
 
 if [ "$CONFIG_SERIAL_EXTENDED" = "y" ]; then
-   bool '   Support more than 4 serial ports' CONFIG_SERIAL_MANY_PORTS
-   bool '   Support for sharing serial interrupts' CONFIG_SERIAL_SHARE_IRQ
-#   bool '   Autodetect IRQ - do not yet enable !!' CONFIG_SERIAL_DETECT_IRQ
-   bool '   Support special multiport boards' CONFIG_SERIAL_MULTIPORT
-   bool '   Support the Bell Technologies HUB6 card' CONFIG_HUB6
+   bool '    Support more than 4 serial ports' CONFIG_SERIAL_MANY_PORTS
+   bool '    Support for sharing serial interrupts' CONFIG_SERIAL_SHARE_IRQ
+#   bool '    Autodetect IRQ - do not yet enable !!' CONFIG_SERIAL_DETECT_IRQ
+   bool '    Support special multiport boards' CONFIG_SERIAL_MULTIPORT
+   bool '    Support the Bell Technologies HUB6 card' CONFIG_HUB6
 fi
 
 if [ "$CONFIG_VME" = "n" ]; then
-  define_bool CONFIG_VT y
-  if [ "$CONFIG_VT" = "y" ]; then
-    bool 'Support for console on virtual terminal' CONFIG_VT_CONSOLE
-  fi
+   define_bool CONFIG_VT y
+   if [ "$CONFIG_VT" = "y" ]; then
+      bool 'Support for console on virtual terminal' CONFIG_VT_CONSOLE
+   fi
 fi
 
 if [ "$CONFIG_ATARI" = "y" ]; then
-  define_bool CONFIG_NVRAM y
+   define_bool CONFIG_NVRAM y
 fi
 
 if [ "$CONFIG_AMIGA" = "y" ]; then
-  tristate 'Amiga mouse support' CONFIG_AMIGAMOUSE
-  if [ "$CONFIG_AMIGAMOUSE" != "n" ]; then
-    define_bool CONFIG_BUSMOUSE y
-  fi
+   tristate 'Amiga mouse support' CONFIG_AMIGAMOUSE
+   if [ "$CONFIG_AMIGAMOUSE" != "n" ]; then
+      define_bool CONFIG_BUSMOUSE y
+   fi
 fi
 if [ "$CONFIG_ATARI" = "y" ]; then
-  tristate 'Atari mouse support' CONFIG_ATARIMOUSE
-  if [ "$CONFIG_ATARIMOUSE" != "n" ]; then
-    define_bool CONFIG_BUSMOUSE y
-  fi
+   tristate 'Atari mouse support' CONFIG_ATARIMOUSE
+   if [ "$CONFIG_ATARIMOUSE" != "n" ]; then
+      define_bool CONFIG_BUSMOUSE y
+   fi
 fi
 if [ "$CONFIG_MAC" = "y" ]; then
    bool 'Mac ADB mouse support' CONFIG_ADBMOUSE
-  if [ "$CONFIG_ADBMOUSE" != "n" ]; then
-    define_bool CONFIG_BUSMOUSE y
-  fi
+   if [ "$CONFIG_ADBMOUSE" != "n" ]; then
+      define_bool CONFIG_BUSMOUSE y
+   fi
 fi
 if [ "$CONFIG_ATARI" = "y" ]; then
-  tristate 'Atari MFP serial support' CONFIG_ATARI_MFPSER
-  tristate 'Atari SCC serial support' CONFIG_ATARI_SCC
-  if [ "$CONFIG_ATARI_SCC" = "y" -o "$CONFIG_ATARI_SCC" = "m" ]; then
-    bool 'Atari SCC serial DMA support' CONFIG_ATARI_SCC_DMA
-  fi
-  tristate 'Atari MIDI serial support' CONFIG_ATARI_MIDI
-  if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-    tristate 'Atari DSP56k support (EXPERIMENTAL)' CONFIG_ATARI_DSP56K
-  fi
+   tristate 'Atari MFP serial support' CONFIG_ATARI_MFPSER
+   tristate 'Atari SCC serial support' CONFIG_ATARI_SCC
+   if [ "$CONFIG_ATARI_SCC" = "y" -o "$CONFIG_ATARI_SCC" = "m" ]; then
+      bool '  Atari SCC serial DMA support' CONFIG_ATARI_SCC_DMA
+   fi
+   tristate 'Atari MIDI serial support' CONFIG_ATARI_MIDI
+   if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+      tristate 'Atari DSP56k support (EXPERIMENTAL)' CONFIG_ATARI_DSP56K
+   fi
 fi
 if [ "$CONFIG_AMIGA" = "y" ]; then
-  tristate 'Amiga builtin serial support' CONFIG_AMIGA_BUILTIN_SERIAL
-  if [ "$CONFIG_AMIGA_PCMCIA" = "y" ]; then
-    tristate 'Hisoft Whippet PCMCIA serial support' CONFIG_WHIPPET_SERIAL
-  fi
+   tristate 'Amiga builtin serial support' CONFIG_AMIGA_BUILTIN_SERIAL
+   if [ "$CONFIG_AMIGA_PCMCIA" = "y" ]; then
+      tristate 'Hisoft Whippet PCMCIA serial support' CONFIG_WHIPPET_SERIAL
+   fi
 fi
 if [ "$CONFIG_PARPORT" = "n" ]; then
-  if [ "$CONFIG_ZORRO" = "y" ]; then
-    tristate 'GVP IO-Extender support' CONFIG_GVPIOEXT
-    dep_tristate 'GVP IO-Extender parallel printer support' CONFIG_GVPIOEXT_LP $CONFIG_GVPIOEXT
-    dep_tristate 'GVP IO-Extender PLIP support' CONFIG_GVPIOEXT_PLIP $CONFIG_GVPIOEXT
-    tristate 'Multiface Card III serial support' CONFIG_MULTIFACE_III_TTY
-  fi
+   if [ "$CONFIG_ZORRO" = "y" ]; then
+      tristate 'GVP IO-Extender support' CONFIG_GVPIOEXT
+      dep_tristate '  GVP IO-Extender parallel printer support' CONFIG_GVPIOEXT_LP $CONFIG_GVPIOEXT
+      dep_tristate '  GVP IO-Extender PLIP support' CONFIG_GVPIOEXT_PLIP $CONFIG_GVPIOEXT
+      tristate 'Multiface Card III serial support' CONFIG_MULTIFACE_III_TTY
+   fi
 fi
 if [ "$CONFIG_MAC" = "y" ]; then
-  bool 'Mac SCC serial support' CONFIG_MAC_SCC
+   bool 'Mac SCC serial support' CONFIG_MAC_SCC
 fi
 if [ "$CONFIG_HP300" = "y" -a "$CONFIG_DIO" = "y" ]; then
-  tristate 'HP DCA serial support' CONFIG_HPDCA
+   tristate 'HP DCA serial support' CONFIG_HPDCA
 fi
 if [ "$CONFIG_SUN3X" = "y" ]; then
-  bool 'Sun3x builtin serial support' CONFIG_SUN3X_ZS
-  if [ "$CONFIG_SUN3X_ZS" = "y" ]; then
-    bool 'Sun keyboard support' CONFIG_SUN_KEYBOARD
-    bool 'Sun mouse support' CONFIG_SUN_MOUSE
-    if [ "$CONFIG_SUN_MOUSE" != "n" ]; then
-      define_bool CONFIG_BUSMOUSE y
+   bool 'Sun3x builtin serial support' CONFIG_SUN3X_ZS
+   if [ "$CONFIG_SUN3X_ZS" = "y" ]; then
+      bool '  Sun keyboard support' CONFIG_SUN_KEYBOARD
+      bool '  Sun mouse support' CONFIG_SUN_MOUSE
+      if [ "$CONFIG_SUN_MOUSE" != "n" ]; then
+         define_bool CONFIG_BUSMOUSE y
     fi
     define_bool CONFIG_SBUS y
     define_bool CONFIG_SBUSCHAR y
@@ -391,43 +391,43 @@ fi
 if [ "$CONFIG_AMIGA" = "y" -o "$CONFIG_ATARI" = "y" -o \
      "$CONFIG_MAC" = "y" -o "$CONFIG_HP300" = "y" -o \
      "$CONFIG_SUN3X" = "y" ]; then
-  if [ "$CONFIG_ATARI_MFPSER" = "y" -o "$CONFIG_ATARI_SCC" = "y" -o \
-       "$CONFIG_ATARI_MIDI" = "y" -o "$CONFIG_MAC_SCC" = "y" -o \
-       "$CONFIG_AMIGA_BUILTIN_SERIAL" = "y" -o \
-       "$CONFIG_GVPIOEXT" = "y" -o "$CONFIG_MULTIFACE_III_TTY" = "y" -o \
-       "$CONFIG_HPDCA" = "y" -o "$CONFIG_SUN3X_ZS" = "y" ]; then
-    bool 'Support for serial port console' CONFIG_SERIAL_CONSOLE
-  fi
+   if [ "$CONFIG_ATARI_MFPSER" = "y" -o "$CONFIG_ATARI_SCC" = "y" -o \
+        "$CONFIG_ATARI_MIDI" = "y" -o "$CONFIG_MAC_SCC" = "y" -o \
+        "$CONFIG_AMIGA_BUILTIN_SERIAL" = "y" -o \
+        "$CONFIG_GVPIOEXT" = "y" -o "$CONFIG_MULTIFACE_III_TTY" = "y" -o \
+        "$CONFIG_HPDCA" = "y" -o "$CONFIG_SUN3X_ZS" = "y" ]; then
+      bool 'Support for serial port console' CONFIG_SERIAL_CONSOLE
+   fi
 fi
 if [ "$CONFIG_VME" = "y" ]; then
-  define_bool CONFIG_SERIAL_CONSOLE y
-  if [ "$CONFIG_MVME147" = "y" ]; then
-    bool 'SCC support for MVME147 serial ports' CONFIG_MVME147_SCC
-  fi
-  if [ "$CONFIG_MVME16x" = "y" ]; then
-    bool 'CD2401 support for MVME166/7 serial ports' CONFIG_SERIAL167
-    bool 'SCC support for MVME162 serial ports' CONFIG_MVME162_SCC
-  fi
-  if [ "$CONFIG_BVME6000" = "y" ]; then
-    bool 'SCC support for BVME6000 serial ports' CONFIG_BVME6000_SCC
-  fi
+   define_bool CONFIG_SERIAL_CONSOLE y
+   if [ "$CONFIG_MVME147" = "y" ]; then
+      bool 'SCC support for MVME147 serial ports' CONFIG_MVME147_SCC
+   fi
+   if [ "$CONFIG_MVME16x" = "y" ]; then
+      bool 'CD2401 support for MVME166/7 serial ports' CONFIG_SERIAL167
+      bool 'SCC support for MVME162 serial ports' CONFIG_MVME162_SCC
+   fi
+   if [ "$CONFIG_BVME6000" = "y" ]; then
+      bool 'SCC support for BVME6000 serial ports' CONFIG_BVME6000_SCC
+   fi
 fi
 if [ "$CONFIG_APOLLO" = "y" ]; then
-  bool 'Support for DN serial port (dummy)' CONFIG_SERIAL
-  bool 'Support for serial port console' CONFIG_SERIAL_CONSOLE
+   bool 'Support for DN serial port (dummy)' CONFIG_SERIAL
+   bool 'Support for serial port console' CONFIG_SERIAL_CONSOLE
 fi 
 bool 'Support for user serial device modules' CONFIG_USERIAL
 bool 'Watchdog Timer Support'	CONFIG_WATCHDOG
 if [ "$CONFIG_WATCHDOG" != "n" ]; then
-  bool '   Disable watchdog shutdown on close' CONFIG_WATCHDOG_NOWAYOUT
-  bool '   Software Watchdog' CONFIG_SOFT_WATCHDOG
+   bool '  Disable watchdog shutdown on close' CONFIG_WATCHDOG_NOWAYOUT
+   bool '  Software Watchdog' CONFIG_SOFT_WATCHDOG
 fi
 if [ "$CONFIG_ATARI" = "y" ]; then
-  bool 'Enhanced Real Time Clock Support' CONFIG_RTC
+   bool 'Enhanced Real Time Clock Support' CONFIG_RTC
 fi
 bool 'Unix98 PTY support' CONFIG_UNIX98_PTYS
 if [ "$CONFIG_UNIX98_PTYS" = "y" ]; then
-  int 'Maximum number of Unix98 PTYs in use (0-2048)' CONFIG_UNIX98_PTY_COUNT 256
+   int '  Maximum number of Unix98 PTYs in use (0-2048)' CONFIG_UNIX98_PTY_COUNT 256
 fi
 
 endmenu
@@ -437,22 +437,22 @@ comment 'Sound support'
 
 tristate 'Sound support' CONFIG_SOUND
 if [ "$CONFIG_SOUND" != "n" ]; then
-  dep_tristate 'Amiga or Atari DMA sound support' CONFIG_DMASOUND $CONFIG_SOUND
+   dep_tristate '  Amiga or Atari DMA sound support' CONFIG_DMASOUND $CONFIG_SOUND
 fi
 endmenu
 
 source fs/Config.in
 
 if [ "$CONFIG_VME" = "n" ]; then
-  mainmenu_option next_comment
-  comment 'Console drivers'
-  if [ "$CONFIG_HP300" = "y" ]; then
-    bool 'Frame buffer support' CONFIG_FB
-  else
-    define_bool CONFIG_FB y
-  fi
-  source drivers/video/Config.in
-  endmenu
+   mainmenu_option next_comment
+   comment 'Console drivers'
+   if [ "$CONFIG_HP300" = "y" ]; then
+      bool 'Frame buffer support' CONFIG_FB
+   else
+      define_bool CONFIG_FB y
+   fi
+   source drivers/video/Config.in
+   endmenu
 fi
 
 mainmenu_option next_comment