patch-2.3.99-pre4 linux/arch/alpha/config.in

• Lines: 34
• Date: Mon Mar 27 14:18:32 2000
• Orig file: v2.3.99-pre3/linux/arch/alpha/config.in
• Orig date: Mon Mar 27 08:08:21 2000

diff -u --recursive --new-file v2.3.99-pre3/linux/arch/alpha/config.in linux/arch/alpha/config.in
@@ -65,6 +65,7 @@
 # Most of these machines have ISA slots; not exactly sure which don't,
 # and this doesn't activate hordes of code, so do it always.
 define_bool CONFIG_ISA y
+define_bool CONFIG_SBUS n
 
 if [ "$CONFIG_ALPHA_JENSEN" = "y" ]
 then
@@ -189,6 +190,8 @@
  
 if [ "$CONFIG_HOTPLUG" = "y" ] ; then
    source drivers/pcmcia/Config.in
+else
+   define_bool CONFIG_PCMCIA n
 fi
 
 bool 'Networking support' CONFIG_NET
@@ -274,7 +277,6 @@
 
 source drivers/char/Config.in
 
-source drivers/usb/Config.in
 
 #source drivers/misc/Config.in
 
@@ -299,6 +301,8 @@
   source drivers/sound/Config.in
 fi
 endmenu
+
+source drivers/usb/Config.in
 
 mainmenu_option next_comment
 comment 'Kernel hacking'