summaryrefslogtreecommitdiff
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-12-22 14:06:14 -0800
committerOlof Johansson <olof@lixom.net>2013-12-22 14:06:14 -0800
commit9b20d1c9022493b194a88acac0289ff09fedaf92 (patch)
tree9574964fc867bf8af55844c61e133bddbc8afa81 /arch/arm/Kconfig
parent4721f3cec17717679397cc57b25fb8c62375cffe (diff)
parent70bacadbd07248576290de40cc217c06f0f2d3c3 (diff)
Merge tag 'samsung-dev' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc
From Kukjin Kim: Samsung updates for v3.14 - Skip eint_init() for pinctrl-exynos because of re-executing - Use CPU_V6K for S3C64XX(ARM1176JZF-s) instead of CPU_V6 * tag 'samsung-dev' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: S3C64XX: Select CPU_V6K instead of CPU_V6 ARM: SAMSUNG: if detected device tree skip irq init for S5P Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e351f1c8a6a9..5f7f8d59124a 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -749,7 +749,7 @@ config ARCH_S3C64XX
select CLKDEV_LOOKUP
select CLKSRC_SAMSUNG_PWM
select COMMON_CLK
- select CPU_V6
+ select CPU_V6K
select GENERIC_CLOCKEVENTS
select GPIO_SAMSUNG
select HAVE_S3C2410_I2C if I2C