diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2011-05-11 03:27:51 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-05-11 19:10:53 -0400 |
commit | a73ddc61e8f14ddc7ab6e6a11dc882ef6a697114 (patch) | |
tree | 12fa69805404b7bc5d048051be484782b3165643 /arch/arm/Kconfig | |
parent | 693d92a1bbc9e42681c42ed190bd42b636ca876f (diff) |
ARM: S5P6442: Removing ARCH_S5P6442
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
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 377a7a595b08..e81c72c38fed 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -736,16 +736,6 @@ config ARCH_S5P64X0 | |||
736 | Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440, | 736 | Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440, |
737 | SMDK6450. | 737 | SMDK6450. |
738 | 738 | ||
739 | config ARCH_S5P6442 | ||
740 | bool "Samsung S5P6442" | ||
741 | select CPU_V6 | ||
742 | select GENERIC_GPIO | ||
743 | select HAVE_CLK | ||
744 | select ARCH_USES_GETTIMEOFFSET | ||
745 | select HAVE_S3C2410_WATCHDOG if WATCHDOG | ||
746 | help | ||
747 | Samsung S5P6442 CPU based systems | ||
748 | |||
749 | config ARCH_S5PC100 | 739 | config ARCH_S5PC100 |
750 | bool "Samsung S5PC100" | 740 | bool "Samsung S5PC100" |
751 | select GENERIC_GPIO | 741 | select GENERIC_GPIO |
@@ -995,8 +985,6 @@ endif | |||
995 | 985 | ||
996 | source "arch/arm/mach-s5p64x0/Kconfig" | 986 | source "arch/arm/mach-s5p64x0/Kconfig" |
997 | 987 | ||
998 | source "arch/arm/mach-s5p6442/Kconfig" | ||
999 | |||
1000 | source "arch/arm/mach-s5pc100/Kconfig" | 988 | source "arch/arm/mach-s5pc100/Kconfig" |
1001 | 989 | ||
1002 | source "arch/arm/mach-s5pv210/Kconfig" | 990 | source "arch/arm/mach-s5pv210/Kconfig" |
@@ -1424,7 +1412,7 @@ source kernel/Kconfig.preempt | |||
1424 | config HZ | 1412 | config HZ |
1425 | int | 1413 | int |
1426 | default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P64X0 || \ | 1414 | default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P64X0 || \ |
1427 | ARCH_S5P6442 || ARCH_S5PV210 || ARCH_EXYNOS4 | 1415 | ARCH_S5PV210 || ARCH_EXYNOS4 |
1428 | default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER | 1416 | default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER |
1429 | default AT91_TIMER_HZ if ARCH_AT91 | 1417 | default AT91_TIMER_HZ if ARCH_AT91 |
1430 | default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE | 1418 | default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE |
@@ -2010,7 +1998,7 @@ menu "Power management options" | |||
2010 | source "kernel/power/Kconfig" | 1998 | source "kernel/power/Kconfig" |
2011 | 1999 | ||
2012 | config ARCH_SUSPEND_POSSIBLE | 2000 | config ARCH_SUSPEND_POSSIBLE |
2013 | depends on !ARCH_S5P64X0 && !ARCH_S5P6442 | 2001 | depends on !ARCH_S5P64X0 |
2014 | depends on CPU_ARM920T || CPU_ARM926T || CPU_SA1100 || \ | 2002 | depends on CPU_ARM920T || CPU_ARM926T || CPU_SA1100 || \ |
2015 | CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE | 2003 | CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE |
2016 | def_bool y | 2004 | def_bool y |