Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[pandora-kernel.git] / arch / mips / Kconfig

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index f588b55..3b807b4 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -28,7 +28,6 @@ config BASLER_EXCITE
        select MIPS_RM9122
        select SYS_HAS_CPU_RM9000
        select SYS_SUPPORTS_32BIT_KERNEL
-       select SYS_SUPPORTS_64BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_KGDB
        help
@@ -81,10 +80,10 @@ config MACH_DECSTATION
          If you have one of the following DECstation Models you definitely
          want to choose R4xx0 for the CPU Type:
 
-               DECstation 5000/50
-               DECstation 5000/150
-               DECstation 5000/260
-               DECsystem 5900/260
+               DECstation 5000/50
+               DECstation 5000/150
+               DECstation 5000/260
+               DECsystem 5900/260
 
          otherwise choose R3000.
 
@@ -126,6 +125,7 @@ config LEMOTE_FULONG
        select SYS_SUPPORTS_HIGHMEM
        select SYS_HAS_EARLY_PRINTK
        select GENERIC_HARDIRQS_NO__DO_IRQ
+       select GENERIC_ISA_DMA_SUPPORT_BROKEN
        select CPU_HAS_WB
        help
          Lemote Fulong mini-PC board based on the Chinese Loongson-2E CPU and
@@ -693,9 +693,9 @@ config EARLY_PRINTK
 config SYS_HAS_EARLY_PRINTK
        bool
 
-config GENERIC_ISA_DMA
+config HOTPLUG_CPU
        bool
-       select ZONE_DMA
+       default n
 
 config I8259
        bool
@@ -712,9 +712,13 @@ config MIPS_DISABLE_OBSOLETE_IDE
 config NO_IOPORT
        def_bool n
 
+config GENERIC_ISA_DMA
+       bool
+       select ZONE_DMA if GENERIC_ISA_DMA_SUPPORT_BROKEN=n
+
 config GENERIC_ISA_DMA_SUPPORT_BROKEN
        bool
-       select ZONE_DMA
+       select GENERIC_ISA_DMA
 
 config GENERIC_GPIO
        bool
@@ -814,20 +818,6 @@ config EMMA2RH
 config SERIAL_RM9000
        bool
 
-#
-# Unfortunately not all GT64120 systems run the chip at the same clock.
-# As the user for the clock rate and try to minimize the available options.
-#
-choice
-       prompt "Galileo Chip Clock"
-       depends on MOMENCO_OCELOT
-       default SYSCLK_100 if MOMENCO_OCELOT
-
-config SYSCLK_100
-       bool "100" if MOMENCO_OCELOT
-
-endchoice
-
 config ARC32
        bool