diff --git a/[refs] b/[refs] index b8df1ee92a58..988870e8d26b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6cc6b33ab9644db38579dcb66737311fc20269db +refs/heads/master: 59a4f92a3612f3c3ea4c13b43e0e50ae66abfa7b diff --git a/trunk/arch/arm/common/Kconfig b/trunk/arch/arm/common/Kconfig index 909960448eb9..ea5ee4d067f3 100644 --- a/trunk/arch/arm/common/Kconfig +++ b/trunk/arch/arm/common/Kconfig @@ -7,6 +7,7 @@ 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