aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2011-02-23 20:12:44 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-02-26 08:36:56 -0500
commit59a4f92a3612f3c3ea4c13b43e0e50ae66abfa7b (patch)
tree7b7d05755bd94e90293226827231c3364368fd79
parent6cc6b33ab9644db38579dcb66737311fc20269db (diff)
ARM: 6762/1: Update number of VIC for S5P6442 and S5PC100
The S5P6442 and S5PC100 SoCs have 4 VICs. However, default VIC number is defined 2 in arch/arm/common. So can be happened some problem on it. Basically, it requires for suspend and resume. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/common/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig
index 909960448eb9..ea5ee4d067f3 100644
--- a/arch/arm/common/Kconfig
+++ b/arch/arm/common/Kconfig
@@ -7,6 +7,7 @@ config ARM_VIC
7config ARM_VIC_NR 7config ARM_VIC_NR
8 int 8 int
9 default 4 if ARCH_S5PV210 9 default 4 if ARCH_S5PV210
10 default 3 if ARCH_S5P6442 || ARCH_S5PC100
10 default 2 11 default 2
11 depends on ARM_VIC 12 depends on ARM_VIC
12 help 13 help