Skip to content

Commit

Permalink
Merge branch 'sh/highmem'
Browse files Browse the repository at this point in the history
  • Loading branch information
Paul Mundt committed May 13, 2010
2 parents ef4ed97 + 4b478ee commit 209791b
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions arch/sh/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 209791b

Please sign in to comment.