Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

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

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 5f9b0a3..ef6717a 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -11,7 +11,6 @@ config SUPERH
        select HAVE_ARCH_TRACEHOOK
        select HAVE_DMA_API_DEBUG
        select HAVE_DMA_ATTRS
-       select HAVE_IRQ_WORK
        select HAVE_PERF_EVENTS
        select HAVE_DEBUG_BUGVERBOSE
        select ARCH_HAVE_CUSTOM_GPIO_H
@@ -93,9 +92,6 @@ config GENERIC_CSUM
 config GENERIC_HWEIGHT
        def_bool y
 
-config IRQ_PER_CPU
-       def_bool y
-
 config GENERIC_GPIO
        def_bool n
 
@@ -278,6 +274,7 @@ config CPU_SUBTYPE_SH7203
        select SYS_SUPPORTS_CMT
        select SYS_SUPPORTS_MTU2
        select ARCH_WANT_OPTIONAL_GPIOLIB
+       select PINCTRL
 
 config CPU_SUBTYPE_SH7206
        bool "Support SH7206 processor"
@@ -298,6 +295,7 @@ config CPU_SUBTYPE_SH7264
        select CPU_HAS_FPU
        select SYS_SUPPORTS_CMT
        select SYS_SUPPORTS_MTU2
+       select PINCTRL
 
 config CPU_SUBTYPE_SH7269
        bool "Support SH7269 processor"
@@ -305,6 +303,7 @@ config CPU_SUBTYPE_SH7269
        select CPU_HAS_FPU
        select SYS_SUPPORTS_CMT
        select SYS_SUPPORTS_MTU2
+       select PINCTRL
 
 config CPU_SUBTYPE_MXG
        bool "Support MX-G processor"
@@ -366,6 +365,7 @@ config CPU_SUBTYPE_SH7720
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select USB_ARCH_HAS_OHCI
        select USB_OHCI_SH if USB_OHCI_HCD
+       select PINCTRL
        help
          Select SH7720 if you have a SH3-DSP SH7720 CPU.
 
@@ -431,6 +431,7 @@ config CPU_SUBTYPE_SH7723
        select ARCH_SPARSEMEM_ENABLE
        select SYS_SUPPORTS_CMT
        select ARCH_WANT_OPTIONAL_GPIOLIB
+       select PINCTRL
        help
          Select SH7723 if you have an SH-MobileR2 CPU.
 
@@ -442,6 +443,7 @@ config CPU_SUBTYPE_SH7724
        select ARCH_SPARSEMEM_ENABLE
        select SYS_SUPPORTS_CMT
        select ARCH_WANT_OPTIONAL_GPIOLIB
+       select PINCTRL
        help
          Select SH7724 if you have an SH-MobileR2R CPU.
 
@@ -452,6 +454,7 @@ config CPU_SUBTYPE_SH7734
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select USB_ARCH_HAS_OHCI
        select USB_ARCH_HAS_EHCI
+       select PINCTRL
        help
          Select SH7734 if you have a SH4A SH7734 CPU.
 
@@ -462,6 +465,7 @@ config CPU_SUBTYPE_SH7757
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select USB_ARCH_HAS_OHCI
        select USB_ARCH_HAS_EHCI
+       select PINCTRL
        help
          Select SH7757 if you have a SH4A SH7757 CPU.
 
@@ -488,6 +492,7 @@ config CPU_SUBTYPE_SH7785
        select ARCH_SPARSEMEM_ENABLE
        select SYS_SUPPORTS_NUMA
        select ARCH_WANT_OPTIONAL_GPIOLIB
+       select PINCTRL
 
 config CPU_SUBTYPE_SH7786
        bool "Support SH7786 processor"
@@ -500,6 +505,7 @@ config CPU_SUBTYPE_SH7786
        select USB_OHCI_SH if USB_OHCI_HCD
        select USB_ARCH_HAS_EHCI
        select USB_EHCI_SH if USB_EHCI_HCD
+       select PINCTRL
 
 config CPU_SUBTYPE_SHX3
        bool "Support SH-X3 processor"
@@ -507,6 +513,7 @@ config CPU_SUBTYPE_SHX3
        select CPU_SHX3
        select GENERIC_CLOCKEVENTS_BROADCAST if SMP
        select ARCH_REQUIRE_GPIOLIB
+       select PINCTRL
 
 # SH4AL-DSP Processor Support
 
@@ -525,6 +532,7 @@ config CPU_SUBTYPE_SH7722
        select SYS_SUPPORTS_NUMA
        select SYS_SUPPORTS_CMT
        select ARCH_WANT_OPTIONAL_GPIOLIB
+       select PINCTRL
 
 config CPU_SUBTYPE_SH7366
        bool "Support SH7366 processor"
@@ -650,7 +658,7 @@ source kernel/Kconfig.hz
 
 config KEXEC
        bool "kexec system call (EXPERIMENTAL)"
-       depends on SUPERH32 && EXPERIMENTAL && MMU
+       depends on SUPERH32 && MMU
        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
@@ -667,7 +675,7 @@ config KEXEC
 
 config CRASH_DUMP
        bool "kernel crash dumps (EXPERIMENTAL)"
-       depends on SUPERH32 && EXPERIMENTAL && BROKEN_ON_SMP
+       depends on SUPERH32 && BROKEN_ON_SMP
        help
          Generate crash dump after being started by kexec.
          This should be normally only set in special crash dump kernels
@@ -681,7 +689,7 @@ config CRASH_DUMP
 
 config KEXEC_JUMP
        bool "kexec jump (EXPERIMENTAL)"
-       depends on SUPERH32 && KEXEC && HIBERNATION && EXPERIMENTAL
+       depends on SUPERH32 && KEXEC && HIBERNATION
        help
          Jump between original kernel and kexeced kernel and invoke
          code via KEXEC
@@ -715,7 +723,7 @@ config SECCOMP
 
 config CC_STACKPROTECTOR
        bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
-       depends on SUPERH32 && EXPERIMENTAL
+       depends on SUPERH32
        help
          This option turns on the -fstack-protector GCC feature. This
          feature puts, at the beginning of functions, a canary value on
@@ -766,7 +774,7 @@ config NR_CPUS
 
 config HOTPLUG_CPU
        bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
-       depends on SMP && HOTPLUG && EXPERIMENTAL
+       depends on SMP && HOTPLUG
        help
          Say Y here to experiment with turning CPUs off and on.  CPUs
          can be controlled through /sys/devices/system/cpu.
@@ -845,7 +853,7 @@ config ENTRY_OFFSET
 
 config ROMIMAGE_MMCIF
        bool "Include MMCIF loader in romImage (EXPERIMENTAL)"
-       depends on CPU_SUBTYPE_SH7724 && EXPERIMENTAL
+       depends on CPU_SUBTYPE_SH7724
        help
          Say Y here to include experimental MMCIF loading code in
          romImage. With this enabled it is possible to write the romImage
@@ -931,7 +939,6 @@ source "fs/Kconfig.binfmt"
 endmenu
 
 menu "Power management options (EXPERIMENTAL)"
-depends on EXPERIMENTAL
 
 source "kernel/power/Kconfig"