Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...

[deliverable/linux.git] / arch / arm / common / Kconfig

diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig
index 666ba393575b8d7800b5b8a14d4e5ce1466932bc..5e34ca6d38b6de3132527ffae59904c99b25a7e5 100644 (file)
--- a/arch/arm/common/Kconfig
+++ b/arch/arm/common/Kconfig
@@ -1,7 +1,10 @@
-config ICST525
+config ARM_GIC
        bool
 
-config ARM_GIC
+config ARM_VIC
+       bool
+
+config ICST525
        bool
 
 config ICST307
@@ -23,5 +26,8 @@ config SHARP_LOCOMO
 config SHARP_PARAM
        bool
 
+config SHARPSL_PM
+       bool
+
 config SHARP_SCOOP
        bool