Merge branch 'master' into for_paulus

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

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index d83d64af31f277d5451507d2b60fcc13c3a0af33..4f3891215b87c83f3ff03252558e78b74b981bbd 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -48,6 +48,9 @@ config GENERIC_IOMAP
 config GENERIC_TIME
        def_bool n
 
+config SYS_SUPPORTS_APM_EMULATION
+       bool
+
 config ARCH_MAY_HAVE_PC_FDC
        bool
 
@@ -59,6 +62,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"
@@ -118,6 +129,7 @@ config SH_7751_SYSTEMH
 
 config SH_HP6XX
        bool "HP6XX"
+       select SYS_SUPPORTS_APM_EMULATION
        help
          Select HP6XX if configuring for a HP jornada HP6xx.
          More information (hardware only) at
@@ -471,7 +483,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 +584,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"
@@ -698,9 +698,6 @@ depends on EXPERIMENTAL
 
 source kernel/power/Kconfig
 
-config APM
-       bool "Advanced Power Management Emulation"
-       depends on PM
 endmenu
 
 source "net/Kconfig"