diff options
author | Kyungmin Park <kyungmin.park@samsung.com> | 2010-09-29 08:33:29 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-10-20 18:54:55 -0400 |
commit | f567fa6f62d263b50125b3321f43ba77c221dd82 (patch) | |
tree | 972811f495bbad39a4e6f68a31b4606804926354 /arch/arm | |
parent | eecb6a8420fde47ebc37d03f72ef6dcb8e93c0ef (diff) |
ARM: S5PV310: Place the common SPARSEMEM at ARCH_S5PV310
In case of S5PV310/S5PC210, it uses the SPARSEMEM as default memory
configuration. So moved to ARCH_S5PV310 config.
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
[kgene.kim@samsung.com: edited title]
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-s5pv310/Kconfig | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7f2fed102958..80203dcb97f7 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -731,6 +731,7 @@ config ARCH_S5PV210 | |||
731 | config ARCH_S5PV310 | 731 | config ARCH_S5PV310 |
732 | bool "Samsung S5PV310/S5PC210" | 732 | bool "Samsung S5PV310/S5PC210" |
733 | select CPU_V7 | 733 | select CPU_V7 |
734 | select ARCH_SPARSEMEM_ENABLE | ||
734 | select GENERIC_GPIO | 735 | select GENERIC_GPIO |
735 | select HAVE_CLK | 736 | select HAVE_CLK |
736 | select GENERIC_CLOCKEVENTS | 737 | select GENERIC_CLOCKEVENTS |
diff --git a/arch/arm/mach-s5pv310/Kconfig b/arch/arm/mach-s5pv310/Kconfig index 1d59ce9701c8..289f668528a2 100644 --- a/arch/arm/mach-s5pv310/Kconfig +++ b/arch/arm/mach-s5pv310/Kconfig | |||
@@ -32,7 +32,6 @@ menu "S5PC210 Machines" | |||
32 | config MACH_SMDKC210 | 32 | config MACH_SMDKC210 |
33 | bool "SMDKC210" | 33 | bool "SMDKC210" |
34 | select CPU_S5PV310 | 34 | select CPU_S5PV310 |
35 | select ARCH_SPARSEMEM_ENABLE | ||
36 | select S3C_DEV_RTC | 35 | select S3C_DEV_RTC |
37 | select S3C_DEV_WDT | 36 | select S3C_DEV_WDT |
38 | help | 37 | help |
@@ -42,7 +41,6 @@ config MACH_SMDKC210 | |||
42 | config MACH_UNIVERSAL_C210 | 41 | config MACH_UNIVERSAL_C210 |
43 | bool "Mobile UNIVERSAL_C210 Board" | 42 | bool "Mobile UNIVERSAL_C210 Board" |
44 | select CPU_S5PV310 | 43 | select CPU_S5PV310 |
45 | select ARCH_SPARSEMEM_ENABLE | ||
46 | help | 44 | help |
47 | Machine support for Samsung Mobile Universal S5PC210 Reference | 45 | Machine support for Samsung Mobile Universal S5PC210 Reference |
48 | Board. S5PC210(MCP) is one of package option of S5PV310 | 46 | Board. S5PC210(MCP) is one of package option of S5PV310 |
@@ -54,7 +52,6 @@ menu "S5PV310 Machines" | |||
54 | config MACH_SMDKV310 | 52 | config MACH_SMDKV310 |
55 | bool "SMDKV310" | 53 | bool "SMDKV310" |
56 | select CPU_S5PV310 | 54 | select CPU_S5PV310 |
57 | select ARCH_SPARSEMEM_ENABLE | ||
58 | select S3C_DEV_RTC | 55 | select S3C_DEV_RTC |
59 | select S3C_DEV_WDT | 56 | select S3C_DEV_WDT |
60 | help | 57 | help |