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

• Lines: 49
• Date: Mon Apr 10 22:58:59 2000
• Orig file: v2.3.99-pre3/linux/arch/ppc/config.in
• Orig date: Mon Mar 27 08:08:22 2000

diff -u --recursive --new-file v2.3.99-pre3/linux/arch/ppc/config.in linux/arch/ppc/config.in
@@ -83,12 +83,13 @@
 comment 'General setup'
 
 define_bool CONFIG_ISA n
+define_bool CONFIG_SBUS n
 
 if [ "$CONFIG_APUS" = "y" -o "$CONFIG_4xx" = "y" -o \
      "$CONFIG_82xx" = "y" ]; then
    define_bool CONFIG_PCI n
 else
-   if [ "$CONFIG_6xx" = "y" -o CONFIG_PPC64 ]; then
+   if [ "$CONFIG_6xx" = "y" -o "$CONFIG_PPC64" = "y" ]; then
       define_bool CONFIG_PCI y
    else
    # CONFIG_8xx
@@ -115,6 +116,8 @@
 
 if [ "$CONFIG_HOTPLUG" = "y" ]; then
    source drivers/pcmcia/Config.in
+else
+   define_bool CONFIG_PCMCIA n
 fi
 
 source drivers/parport/Config.in
@@ -247,14 +250,13 @@
 endmenu
 
 source drivers/char/Config.in
-source drivers/usb/Config.in
 source fs/Config.in
 
 mainmenu_option next_comment
 comment 'Sound'
 tristate 'Sound card support' CONFIG_SOUND
 if [ "$CONFIG_SOUND" != "n" ]; then
-  dep_tristate 'Amiga or PowerMac DMA sound support' CONFIG_DMASOUND $CONFIG_SOUND
+  source drivers/sound/dmasound/Config.in
   source drivers/sound/Config.in
 fi
 
@@ -263,6 +265,8 @@
 if [ "$CONFIG_8xx" = "y" ]; then
 source arch/ppc/8xx_io/Config.in
 fi
+
+source drivers/usb/Config.in
 
 mainmenu_option next_comment
 comment 'Kernel hacking'