patch-2.4.0-test11 linux/arch/mips/config.in

Next file: linux/arch/mips/kernel/semaphore.c
Previous file: linux/arch/m68k/kernel/semaphore.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test10/linux/arch/mips/config.in linux/arch/mips/config.in
@@ -33,11 +33,13 @@
 #
 unset CONFIG_ARC32
 unset CONFIG_ISA
+unset CONFIG_EISA
 unset CONFIG_PCI
 unset CONFIG_MIPS_JAZZ
 unset CONFIG_VIDEO_G364
 unset CONFIG_PC_KEYB
 
+define_bool CONFIG_MCA n
 define_bool CONFIG_SBUS n
 
 if [ "$CONFIG_ALGOR_P4032" = "y" ]; then
@@ -59,7 +61,6 @@
    define_bool CONFIG_PC_KEYB y
 fi
 if [ "$CONFIG_COBALT_MICRO_SERVER" = "y" ]; then
-   define_bool CONFIG_ISA n
    define_bool CONFIG_COBALT_27 y
    define_bool CONFIG_COBALT_LCD y
    define_bool CONFIG_COBALT_SERIAL y
@@ -83,6 +84,9 @@
 
 if [ "$CONFIG_ISA" != "y" ]; then
    define_bool CONFIG_ISA n
+   define_bool CONFIG_EISA n
+else
+   define_bool CONFIG_EISA y
 fi
 
 if [ "$CONFIG_PCI" != "y" ]; then

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)