Pull button into test branch

[linux-drm-fsl-dcu.git] / arch / sh / Kconfig

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index d83d64af31f277d5451507d2b60fcc13c3a0af33..3aa3b885ab36ae4fd9575d44e8a7691c5ad03e3e 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -59,6 +59,14 @@ config LOCKDEP_SUPPORT
        bool
        default y
 
+config ARCH_HAS_ILOG2_U32
+       bool
+       default n
+
+config ARCH_HAS_ILOG2_U64
+       bool
+       default n
+
 source "init/Kconfig"
 
 menu "System type"
@@ -471,7 +479,7 @@ config SH_CLK_MD
        int "CPU Mode Pin Setting"
        depends on CPU_SUBTYPE_SH7619 || CPU_SUBTYPE_SH7206
        help
-         MD2 - MD0 Setting.
+         MD2 - MD0 pin setting.
 
 menu "CPU Frequency scaling"
 
@@ -572,18 +580,6 @@ config NR_CPUS
 
 source "kernel/Kconfig.preempt"
 
-config CPU_HAS_SR_RB
-       bool "CPU has SR.RB"
-       depends on CPU_SH3 || CPU_SH4
-       default y
-       help
-         This will enable the use of SR.RB register bank usage. Processors
-         that are lacking this bit must have another method in place for
-         accomplishing what is taken care of by the banked registers.
-
-         See <file:Documentation/sh/register-banks.txt> for further
-         information on SR.RB and register banking in the kernel in general.
-
 config NODES_SHIFT
        int
        default "1"