diff --git a/[refs] b/[refs] index 09ce39c50992..b8df1ee92a58 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c09bae709182046ab104757115dfbd74a1ba1a15 +refs/heads/master: 6cc6b33ab9644db38579dcb66737311fc20269db diff --git a/trunk/arch/arm/common/Kconfig b/trunk/arch/arm/common/Kconfig index 778655f0257a..909960448eb9 100644 --- a/trunk/arch/arm/common/Kconfig +++ b/trunk/arch/arm/common/Kconfig @@ -6,6 +6,7 @@ config ARM_VIC config ARM_VIC_NR int + default 4 if ARCH_S5PV210 default 2 depends on ARM_VIC help