patch-2.3.99-pre2 linux/arch/arm/config.in

• Lines: 32
• Date: Sat Mar 18 11:38:03 2000
• Orig file: v2.3.99-pre1/linux/arch/arm/config.in
• Orig date: Tue Mar 14 19:10:38 2000

diff -u --recursive --new-file v2.3.99-pre1/linux/arch/arm/config.in linux/arch/arm/config.in
@@ -35,9 +35,9 @@
 
 if [ "$CONFIG_HOST_FOOTBRIDGE" = "y" ]; then
    bool '  Include support for EBSA285' CONFIG_ARCH_EBSA285
-   bool '  Include support for CATS' CONFIG_CATS
+   bool '  Include support for CATS' CONFIG_ARCH_CATS
    bool '  Include support for NetWinder' CONFIG_ARCH_NETWINDER
-   bool '  Include support for Compaq Personal Server' CONFIG_PERSONAL_SERVER
+   bool '  Include support for Compaq Personal Server' CONFIG_ARCH_PERSONAL_SERVER
 fi
 
 if [ "$CONFIG_ADDIN_FOOTBRIDGE" = "y" ]; then
@@ -124,7 +124,7 @@
 #
 # These machines have ISA-DMA
 #
-if [ "$CONFIG_CATS" = "y" -o \
+if [ "$CONFIG_ARCH_CATS" = "y" -o \
      "$CONFIG_ARCH_SHARK" = "y" -o \
      "$CONFIG_ARCH_NETWINDER" = "y" ]; then
    define_bool CONFIG_ISA_DMA y
@@ -171,8 +171,8 @@
 if [ "$CONFIG_ARCH_EBSA110" = "y" -o \
      "$CONFIG_ARCH_SA1100" = "y" -o \
      "$CONFIG_ARCH_NETWINDER" = "y" -o \
-     "$CONFIG_PERSONAL_SERVER" = "y" -o \
-     "$CONFIG_CATS" = "y" ]; then
+     "$CONFIG_ARCH_PERSONAL_SERVER" = "y" -o \
+     "$CONFIG_ARCH_CATS" = "y" ]; then
    string 'Initial kernel command string' CONFIG_CMDLINE
 fi
 if [ "$CONFIG_ARCH_NETWINDER" = "y" -o \