Merge branch 'upstream/wm8974' into for-2.6.33

[pandora-kernel.git] / arch / arm / common / Kconfig

diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig
index a2cd9be..4efbb9d 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,10 +35,6 @@ config SHARP_LOCOMO
 config SHARP_PARAM
        bool
 
-config SHARPSL_PM
-       bool
-       select APM_EMULATION
-
 config SHARP_SCOOP
        bool