patch-2.4.0-test2 linux/arch/sparc/config.in

• Lines: 104
• Date: Thu Jun 22 07:21:12 2000
• Orig file: v2.4.0-test1/linux/arch/sparc/config.in
• Orig date: Tue May 23 15:31:34 2000

diff -u --recursive --new-file v2.4.0-test1/linux/arch/sparc/config.in linux/arch/sparc/config.in
@@ -1,4 +1,4 @@
-# $Id: config.in,v 1.93 2000/05/22 08:12:19 davem Exp $
+# $Id: config.in,v 1.96 2000/06/20 01:10:00 anton Exp $
 # For a description of the syntax of this configuration file,
 # see the Configure script.
 #
@@ -12,6 +12,15 @@
 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 'General setup'
 
 define_bool CONFIG_VT y
@@ -59,15 +68,6 @@
 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 'Console drivers'
 bool 'PROM console' CONFIG_PROM_CONSOLE
 source drivers/video/Config.in
@@ -92,9 +92,10 @@
 fi
 
 tristate 'RAM disk support' CONFIG_BLK_DEV_RAM
-if [ "$CONFIG_BLK_DEV_RAM" = "y" ]; then
-   bool '  Initial RAM disk (initrd) support' CONFIG_BLK_DEV_INITRD
+if [ "$CONFIG_BLK_DEV_RAM" = "y" -o "$CONFIG_BLK_DEV_RAM" = "m" ]; then
+	int '   Default RAM disk size' CONFIG_BLK_DEV_RAM_SIZE 4096
 fi
+dep_bool '  Initial RAM disk (initrd) support' CONFIG_BLK_DEV_INITRD $CONFIG_BLK_DEV_RAM
 
 tristate 'Loopback device support' CONFIG_BLK_DEV_LOOP
 tristate 'Network block device support' CONFIG_BLK_DEV_NBD
@@ -105,22 +106,27 @@
    source net/Config.in
 fi
 
-define_bool CONFIG_IDE n
-define_bool CONFIG_BLK_DEV_IDE_MODES n
-define_bool CONFIG_BLK_DEV_HD n
+# Don't frighten a common SBus user
+if [ "$CONFIG_PCI" = "y" ]; then
 
-# mainmenu_option next_comment
-# comment 'ATA/IDE/MFM/RLL support'
-#
-# tristate 'ATA/IDE/MFM/RLL support' CONFIG_IDE
-#
-# if [ "$CONFIG_IDE" != "n" ]; then
-#   source drivers/ide/Config.in
-# else
-#   define_bool CONFIG_BLK_DEV_IDE_MODES n
-#   define_bool CONFIG_BLK_DEV_HD n
-# fi
-# endmenu
+  mainmenu_option next_comment
+  comment 'ATA/IDE/MFM/RLL support'
+
+  tristate 'ATA/IDE/MFM/RLL support' CONFIG_IDE
+
+  if [ "$CONFIG_IDE" != "n" ]; then
+    source drivers/ide/Config.in
+  else
+    define_bool CONFIG_BLK_DEV_IDE_MODES n
+    define_bool CONFIG_BLK_DEV_HD n
+  fi
+  endmenu
+else
+
+  define_bool CONFIG_IDE n
+  define_bool CONFIG_BLK_DEV_IDE_MODES n
+  define_bool CONFIG_BLK_DEV_HD n
+fi
 
 mainmenu_option next_comment
 comment 'ISDN subsystem'
@@ -211,6 +217,9 @@
       fi
       tristate '  Sun QuadEthernet support' CONFIG_SUNQE
       tristate '  MyriCOM Gigabit Ethernet support' CONFIG_MYRI_SBUS
+      if [ "$CONFIG_PCI" = "y" ]; then
+         tristate '3c590/3c900 series (592/595/597) "Vortex/Boomerang" support' CONFIG_VORTEX
+      fi
 
 #      bool '  FDDI driver support' CONFIG_FDDI
 #      if [ "$CONFIG_FDDI" = "y" ]; then