diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-13 17:48:13 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-13 17:48:13 +0900 |
| commit | 209791b2cc3cdaf0f6ff49c25db975f8bbf573dd (patch) | |
| tree | cb7738954267746d14ddd101e9be88c8a9449d03 /arch/sh | |
| parent | ef4ed97d6bd91aa41907181e80a7feaf2721719a (diff) | |
| parent | 4b478ee2a1251d99813a90afeb0f809b3a8b04fb (diff) | |
| download | linux-3.10-209791b2cc3cdaf0f6ff49c25db975f8bbf573dd.tar.gz linux-3.10-209791b2cc3cdaf0f6ff49c25db975f8bbf573dd.tar.bz2 linux-3.10-209791b2cc3cdaf0f6ff49c25db975f8bbf573dd.zip | |
Merge branch 'sh/highmem'
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/Kconfig | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 38611bcdf74..e6c4776771d 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -236,6 +236,8 @@ config CPU_SHX2 config CPU_SHX3 bool select DMA_COHERENT + select SYS_SUPPORTS_SMP + select SYS_SUPPORTS_NUMA config ARCH_SHMOBILE bool @@ -452,18 +454,12 @@ config CPU_SUBTYPE_SH7786 select CPU_SH4A select CPU_SHX3 select CPU_HAS_PTEAEX - select ARCH_SPARSEMEM_ENABLE - select SYS_SUPPORTS_NUMA - select SYS_SUPPORTS_SMP select GENERIC_CLOCKEVENTS_BROADCAST if SMP config CPU_SUBTYPE_SHX3 bool "Support SH-X3 processor" select CPU_SH4A select CPU_SHX3 - select ARCH_SPARSEMEM_ENABLE - select SYS_SUPPORTS_NUMA - select SYS_SUPPORTS_SMP select GENERIC_CLOCKEVENTS_BROADCAST if SMP # SH4AL-DSP Processor Support |