aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-05-13 04:48:13 -0400
committerPaul Mundt <lethal@linux-sh.org>2010-05-13 04:48:13 -0400
commit209791b2cc3cdaf0f6ff49c25db975f8bbf573dd (patch)
treecb7738954267746d14ddd101e9be88c8a9449d03 /arch/sh
parentef4ed97d6bd91aa41907181e80a7feaf2721719a (diff)
parent4b478ee2a1251d99813a90afeb0f809b3a8b04fb (diff)
Merge branch 'sh/highmem'
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/Kconfig8
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 38611bcdf74c..e6c4776771d2 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -236,6 +236,8 @@ config CPU_SHX2
236config CPU_SHX3 236config CPU_SHX3
237 bool 237 bool
238 select DMA_COHERENT 238 select DMA_COHERENT
239 select SYS_SUPPORTS_SMP
240 select SYS_SUPPORTS_NUMA
239 241
240config ARCH_SHMOBILE 242config ARCH_SHMOBILE
241 bool 243 bool
@@ -452,18 +454,12 @@ config CPU_SUBTYPE_SH7786
452 select CPU_SH4A 454 select CPU_SH4A
453 select CPU_SHX3 455 select CPU_SHX3
454 select CPU_HAS_PTEAEX 456 select CPU_HAS_PTEAEX
455 select ARCH_SPARSEMEM_ENABLE
456 select SYS_SUPPORTS_NUMA
457 select SYS_SUPPORTS_SMP
458 select GENERIC_CLOCKEVENTS_BROADCAST if SMP 457 select GENERIC_CLOCKEVENTS_BROADCAST if SMP
459 458
460config CPU_SUBTYPE_SHX3 459config CPU_SUBTYPE_SHX3
461 bool "Support SH-X3 processor" 460 bool "Support SH-X3 processor"
462 select CPU_SH4A 461 select CPU_SH4A
463 select CPU_SHX3 462 select CPU_SHX3
464 select ARCH_SPARSEMEM_ENABLE
465 select SYS_SUPPORTS_NUMA
466 select SYS_SUPPORTS_SMP
467 select GENERIC_CLOCKEVENTS_BROADCAST if SMP 463 select GENERIC_CLOCKEVENTS_BROADCAST if SMP
468 464
469# SH4AL-DSP Processor Support 465# SH4AL-DSP Processor Support