[Linuxconsole-commit]CVS: ruby/linux/arch/sparc64 config.in,1.21,1.22

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/arch/sparc64
In directory usw-pr-cvs1:/tmp/cvs-serv27749/arch/sparc64

Modified Files:
	config.in 
Log Message:
Synced to 2.5.3

Index: config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/sparc64/config.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- config.in	20 Jan 2002 03:54:46 -0000	1.21
+++ config.in	13 Mar 2002 23:48:37 -0000	1.22
@@ -4,19 +4,7 @@
 #
 mainmenu_name "Linux/UltraSPARC Kernel Configuration"
 
-mainmenu_option next_comment
-comment 'Code maturity level options'
-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
+source init/Config.in
 
 mainmenu_option next_comment
 comment 'General setup'
@@ -58,10 +46,6 @@
 source drivers/pci/Config.in
 
 tristate 'Openprom tree appears in /proc/openprom' CONFIG_SUN_OPENPROMFS
-bool 'Networking support' CONFIG_NET
-bool 'System V IPC' CONFIG_SYSVIPC
-bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT
-bool 'Sysctl support' CONFIG_SYSCTL
 if [ "$CONFIG_PROC_FS" = "y" ]; then
    define_bool CONFIG_KCORE_ELF y
 fi
@@ -86,9 +70,6 @@
 fi
 endmenu
 
-source drivers/usb/Config.in
-source drivers/input/Config.in
-
 source drivers/sbus/char/Config.in
 source drivers/sbus/audio/Config.in
 source drivers/mtd/Config.in
@@ -265,6 +246,8 @@
 dep_tristate '  ATI Rage 128' CONFIG_DRM_R128 $CONFIG_DRM
 endmenu
 
+source drivers/input/Config.in
+
 source fs/Config.in
 
 mainmenu_option next_comment
@@ -275,6 +258,8 @@
    source drivers/sound/Config.in
 fi
 endmenu
+
+source drivers/usb/Config.in
 
 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
    source net/bluetooth/Config.in