diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-25 16:47:48 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-25 16:47:48 -0400 |
| commit | 586893ebc42943008010b4c210cfc9167df615e5 (patch) | |
| tree | eec3179235978fba9ca6bfae0799d97c8532ee15 /arch/arm/common | |
| parent | 014322dac6ae0048c928c6ca2faf0d53194f9d15 (diff) | |
| parent | bd6356bdafc853201168f718f0059fbe11191461 (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts:
arch/arm/Kconfig
arch/arm/mach-exynos4/mach-nuri.c
Diffstat (limited to 'arch/arm/common')
| -rw-r--r-- | arch/arm/common/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig index ea5ee4d067f3..4b71766fb21d 100644 --- a/arch/arm/common/Kconfig +++ b/arch/arm/common/Kconfig | |||
| @@ -7,7 +7,7 @@ config ARM_VIC | |||
| 7 | config ARM_VIC_NR | 7 | config 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 3 if ARCH_S5PC100 |
| 11 | default 2 | 11 | default 2 |
| 12 | depends on ARM_VIC | 12 | depends on ARM_VIC |
| 13 | help | 13 | help |