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

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

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 9eb7eaa..ae9c716 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -38,8 +38,10 @@ config MIPS
        select GENERIC_CLOCKEVENTS
        select GENERIC_CMOS_UPDATE
        select HAVE_MOD_ARCH_SPECIFIC
+       select HAVE_VIRT_TO_BUS
        select MODULES_USE_ELF_REL if MODULES
        select MODULES_USE_ELF_RELA if MODULES && 64BIT
+       select CLONE_BACKWARDS
 
 menu "Machine selection"
 
@@ -171,7 +173,7 @@ config MACH_DECSTATION
        select SYS_HAS_CPU_R3000
        select SYS_HAS_CPU_R4X00
        select SYS_SUPPORTS_32BIT_KERNEL
-       select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
+       select SYS_SUPPORTS_64BIT_KERNEL
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SYS_SUPPORTS_128HZ
        select SYS_SUPPORTS_256HZ
@@ -207,7 +209,7 @@ config MACH_JAZZ
        select ISA
        select SYS_HAS_CPU_R4X00
        select SYS_SUPPORTS_32BIT_KERNEL
-       select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
+       select SYS_SUPPORTS_64BIT_KERNEL
        select SYS_SUPPORTS_100HZ
        help
         This a family of machines based on the MIPS R4030 chipset which was
@@ -389,7 +391,6 @@ config NXP_STB225
 
 config PMC_MSP
        bool "PMC-Sierra MSP chipsets"
-       depends on EXPERIMENTAL
        select CEVT_R4K
        select CSRC_R4K
        select DMA_NONCOHERENT
@@ -504,8 +505,7 @@ config SGI_IP27
          here.
 
 config SGI_IP28
-       bool "SGI IP28 (Indigo2 R10k) (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+       bool "SGI IP28 (Indigo2 R10k)"
        select FW_ARC
        select FW_ARC64
        select BOOT_ELF64
@@ -563,7 +563,6 @@ config SGI_IP32
 
 config SIBYTE_CRHINE
        bool "Sibyte BCM91120C-CRhine"
-       depends on EXPERIMENTAL
        select BOOT_ELF32
        select DMA_COHERENT
        select SIBYTE_BCM1120
@@ -574,7 +573,6 @@ config SIBYTE_CRHINE
 
 config SIBYTE_CARMEL
        bool "Sibyte BCM91120x-Carmel"
-       depends on EXPERIMENTAL
        select BOOT_ELF32
        select DMA_COHERENT
        select SIBYTE_BCM1120
@@ -585,7 +583,6 @@ config SIBYTE_CARMEL
 
 config SIBYTE_CRHONE
        bool "Sibyte BCM91125C-CRhone"
-       depends on EXPERIMENTAL
        select BOOT_ELF32
        select DMA_COHERENT
        select SIBYTE_BCM1125
@@ -597,7 +594,6 @@ config SIBYTE_CRHONE
 
 config SIBYTE_RHONE
        bool "Sibyte BCM91125E-Rhone"
-       depends on EXPERIMENTAL
        select BOOT_ELF32
        select DMA_COHERENT
        select SIBYTE_BCM1125H
@@ -622,7 +618,6 @@ config SIBYTE_SWARM
 
 config SIBYTE_LITTLESUR
        bool "Sibyte BCM91250C2-LittleSur"
-       depends on EXPERIMENTAL
        select BOOT_ELF32
        select DMA_COHERENT
        select HAVE_PATA_PLATFORM
@@ -636,7 +631,6 @@ config SIBYTE_LITTLESUR
 
 config SIBYTE_SENTOSA
        bool "Sibyte BCM91250E-Sentosa"
-       depends on EXPERIMENTAL
        select BOOT_ELF32
        select DMA_COHERENT
        select NR_CPUS_DEFAULT_2
@@ -685,7 +679,7 @@ config SNI_RM
        select R5000_CPU_SCACHE
        select SYS_HAS_EARLY_PRINTK
        select SYS_SUPPORTS_32BIT_KERNEL
-       select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
+       select SYS_SUPPORTS_64BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_HIGHMEM
        select SYS_SUPPORTS_LITTLE_ENDIAN
@@ -789,7 +783,6 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
 
 config NLM_XLR_BOARD
        bool "Netlogic XLR/XLS based systems"
-       depends on EXPERIMENTAL
        select BOOT_ELF32
        select NLM_COMMON
        select SYS_HAS_CPU_XLR
@@ -818,7 +811,6 @@ config NLM_XLR_BOARD
 
 config NLM_XLP_BOARD
        bool "Netlogic XLP based systems"
-       depends on EXPERIMENTAL
        select BOOT_ELF32
        select NLM_COMMON
        select SYS_HAS_CPU_XLP
@@ -1375,7 +1367,6 @@ config CPU_R5500
 
 config CPU_R6000
        bool "R6000"
-       depends on EXPERIMENTAL
        depends on SYS_HAS_CPU_R6000
        select CPU_SUPPORTS_32BIT_KERNEL
        help
@@ -1393,7 +1384,6 @@ config CPU_NEVADA
 
 config CPU_R8000
        bool "R8000"
-       depends on EXPERIMENTAL
        depends on SYS_HAS_CPU_R8000
        select CPU_HAS_PREFETCH
        select CPU_SUPPORTS_64BIT_KERNEL
@@ -1768,7 +1758,7 @@ config PAGE_SIZE_4KB
 
 config PAGE_SIZE_8KB
        bool "8kB"
-       depends on (EXPERIMENTAL && CPU_R8000) || CPU_CAVIUM_OCTEON
+       depends on CPU_R8000 || CPU_CAVIUM_OCTEON
        help
          Using 8kB page size will result in higher performance kernel at
          the price of higher memory consumption.  This option is available
@@ -1795,7 +1785,7 @@ config PAGE_SIZE_32KB
 
 config PAGE_SIZE_64KB
        bool "64kB"
-       depends on EXPERIMENTAL && !CPU_R3000 && !CPU_TX39XX
+       depends on !CPU_R3000 && !CPU_TX39XX
        help
          Using 64kB page size will result in higher performance kernel at
          the price of higher memory consumption.  This option is available on
@@ -2311,8 +2301,7 @@ config HZ
 source "kernel/Kconfig.preempt"
 
 config KEXEC
-       bool "Kexec system call (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+       bool "Kexec system call"
        help
          kexec is a system call that implements the ability to shutdown your
          current kernel, and to start another kernel.  It is like a reboot