Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...

[sfrench/cifs-2.6.git] / arch / arm / common / Kconfig

diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig
index 86b5e6982660da255a13148a9392dc4d73def0b4..4efbb9df0444c6aaa249090b48e6ff7e56d9e259 100644 (file)
--- a/arch/arm/common/Kconfig
+++ b/arch/arm/common/Kconfig
@@ -4,6 +4,14 @@ config ARM_GIC
 config ARM_VIC
        bool
 
+config ARM_VIC_NR
+       int
+       default 2
+       depends on ARM_VIC
+       help
+         The maximum number of VICs available in the system, for
+         power management.
+
 config ICST525
        bool
 
@@ -27,9 +35,8 @@ config SHARP_LOCOMO
 config SHARP_PARAM
        bool
 
-config SHARPSL_PM
+config SHARP_SCOOP
        bool
-       select APM_EMULATION
 
-config SHARP_SCOOP
+config COMMON_CLKDEV
        bool