patch-2.4.0-test10 linux/arch/ppc/config.in

• Lines: 33
• Date: Mon Oct 16 12:51:16 2000
• Orig file: v2.4.0-test9/linux/arch/ppc/config.in
• Orig date: Sun Oct 8 10:50:07 2000

diff -u --recursive --new-file v2.4.0-test9/linux/arch/ppc/config.in linux/arch/ppc/config.in
@@ -104,11 +104,11 @@
      "$CONFIG_8260" = "y" ]; then
    define_bool CONFIG_PCI n
 else
-   if [ "$CONFIG_6xx" = "y" -o "$CONFIG_PPC64BRIDGE" = "y" ]; then
-      define_bool CONFIG_PCI y
+   if [ "$CONFIG_8xx" = "y" ]; then
+      bool 'QSpan PCI' CONFIG_PCI_QSPAN
+      define_bool CONFIG_PCI $CONFIG_PCI_QSPAN
    else
-   # CONFIG_8xx
-      bool 'QSpan PCI' CONFIG_PCI
+      define_bool CONFIG_PCI y
    fi
 fi
 
@@ -126,6 +126,7 @@
 tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
 
 source drivers/pci/Config.in
+source drivers/zorro/Config.in
 
 bool 'Support for hot-pluggable devices' CONFIG_HOTPLUG
 
@@ -151,7 +152,7 @@
 fi
 
 if [ "$CONFIG_PREP" = "y" -o "$CONFIG_ALL_PPC" = "y" ]; then
-  bool 'PReP bootloader kernel arguments' CONFIG_CMDLINE_BOOL y
+  bool 'PReP bootloader kernel arguments' CONFIG_CMDLINE_BOOL
   if [ "$CONFIG_CMDLINE_BOOL" = "y" ] ; then
     string 'Initial kernel command string' CONFIG_CMDLINE "console=ttyS0,9600 console=tty0 root=/dev/sda2"
   fi