Merge git://git.infradead.org/battery-2.6

[sfrench/cifs-2.6.git] / arch / arm / common / Kconfig

diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig
index 778655f0257a9f27f73d3c1a0fddd81eb28919f4..ea5ee4d067f34e99d40bc58a78e3a75c1e9e3df8 100644 (file)
--- a/arch/arm/common/Kconfig
+++ b/arch/arm/common/Kconfig
@@ -6,6 +6,8 @@ config ARM_VIC
 
 config ARM_VIC_NR
        int
+       default 4 if ARCH_S5PV210
+       default 3 if ARCH_S5P6442 || ARCH_S5PC100
        default 2
        depends on ARM_VIC
        help