Merge branch 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6.git
[linux-2.6] / arch / arm / common / Kconfig
index d7509c7..2e32acc 100644 (file)
@@ -1,7 +1,10 @@
-config ICST525
+config ARM_GIC
        bool
 
-config ARM_GIC
+config ARM_VIC
+       bool
+
+config ICST525
        bool
 
 config ICST307
@@ -9,7 +12,8 @@ config ICST307
 
 config SA1111
        bool
-       select DMABOUNCE
+       select DMABOUNCE if !ARCH_PXA
+       select ZONE_DMA if !ARCH_PXA
 
 config DMABOUNCE
        bool
@@ -25,6 +29,7 @@ config SHARP_PARAM
 
 config SHARPSL_PM
        bool
+       select APM_EMULATION
 
 config SHARP_SCOOP
        bool