Merge branch 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux...

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

diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig
index a2cd9be..0a34c81 100644 (file)
--- a/arch/arm/common/Kconfig
+++ b/arch/arm/common/Kconfig
@@ -4,10 +4,18 @@ config ARM_GIC
 config ARM_VIC
        bool
 
-config ICST525
+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 ICST
        bool
 
-config ICST307
+config PL330
        bool
 
 config SA1111
@@ -27,12 +35,9 @@ config SHARP_LOCOMO
 config SHARP_PARAM
        bool
 
-config SHARPSL_PM
-       bool
-       select APM_EMULATION
-
 config SHARP_SCOOP
        bool
 
 config COMMON_CLKDEV
        bool
+       select HAVE_CLK