diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-25 22:47:48 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-25 22:47:48 +0200 |
| commit | 586893ebc42943008010b4c210cfc9167df615e5 (patch) | |
| tree | eec3179235978fba9ca6bfae0799d97c8532ee15 /arch/arm/Kconfig | |
| parent | Merge branch 'davinci-next' of git://gitorious.org/linux-davinci/linux-davinc... (diff) | |
| parent | Merge branch 'dev/removing-s5p6442' into for-next (diff) | |
| download | linux-586893ebc42943008010b4c210cfc9167df615e5.tar.xz linux-586893ebc42943008010b4c210cfc9167df615e5.zip | |
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/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3bc1a58cc7d8..f7cce8b75f49 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -730,16 +730,6 @@ config ARCH_S5P64X0 Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440, SMDK6450. -config ARCH_S5P6442 - bool "Samsung S5P6442" - select CPU_V6 - select GENERIC_GPIO - select HAVE_CLK - select ARCH_USES_GETTIMEOFFSET - select HAVE_S3C2410_WATCHDOG if WATCHDOG - help - Samsung S5P6442 CPU based systems - config ARCH_S5PC100 bool "Samsung S5PC100" select GENERIC_GPIO @@ -991,8 +981,6 @@ endif source "arch/arm/mach-s5p64x0/Kconfig" -source "arch/arm/mach-s5p6442/Kconfig" - source "arch/arm/mach-s5pc100/Kconfig" source "arch/arm/mach-s5pv210/Kconfig" @@ -1420,7 +1408,7 @@ source kernel/Kconfig.preempt config HZ int default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P64X0 || \ - ARCH_S5P6442 || ARCH_S5PV210 || ARCH_EXYNOS4 + ARCH_S5PV210 || ARCH_EXYNOS4 default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER default AT91_TIMER_HZ if ARCH_AT91 default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE @@ -2028,7 +2016,7 @@ menu "Power management options" source "kernel/power/Kconfig" config ARCH_SUSPEND_POSSIBLE - depends on !ARCH_S5P64X0 && !ARCH_S5P6442 && !ARCH_S5PC100 + depends on !ARCH_S5P64X0 && !ARCH_S5PC100 depends on CPU_ARM920T || CPU_ARM926T || CPU_SA1100 || \ CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE def_bool y |