[SCSI] Merge up to linux-2.6 head

[linux-2.6-omap-h63xx.git] / arch / arm / common / Kconfig

diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig
index d7509c7a3c5e651a2634ea04f203aca8a5226f4f..3e073467caca6b63a5515b2bd9afb543ca233e2e 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
@@ -25,6 +28,7 @@ config SHARP_PARAM
 
 config SHARPSL_PM
        bool
+       select APM_EMULATION
 
 config SHARP_SCOOP
        bool