diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-05-16 16:29:50 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-05-16 16:29:50 +0900 |
| commit | bd6356bdafc853201168f718f0059fbe11191461 (patch) | |
| tree | e2f82e8950b0201ab93c8fa8ff07ac31ba1c2a35 /arch/arm/common | |
| parent | 3185847957d4834d1b30b253b1c71bb05bad7265 (diff) | |
| parent | 4b42120df72aeebd3967c952804cb1af53b91cc5 (diff) | |
| download | linux-bd6356bdafc853201168f718f0059fbe11191461.tar.gz linux-bd6356bdafc853201168f718f0059fbe11191461.tar.bz2 linux-bd6356bdafc853201168f718f0059fbe11191461.zip | |
Merge branch 'dev/removing-s5p6442' into for-next
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 config ARM_VIC_NR int default 4 if ARCH_S5PV210 - default 3 if ARCH_S5P6442 || ARCH_S5PC100 + default 3 if ARCH_S5PC100 default 2 depends on ARM_VIC help |