Merge branches 'at91', 'bcmring', 'ep93xx', 'iop', 'misc', 'nomadik', 'omap', 'pxa...

[net-next-2.6.git] / arch / arm / common / Kconfig

diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig
index cf9059091884c3a5575e09ad1bb42212c6d8970a..0a34c8186924415398601d46d488a2b011136219 100644 (file)
--- a/arch/arm/common/Kconfig
+++ b/arch/arm/common/Kconfig
@@ -12,10 +12,7 @@ config ARM_VIC_NR
          The maximum number of VICs available in the system, for
          power management.
 
-config ICST525
-       bool
-
-config ICST307
+config ICST
        bool
 
 config PL330