diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:27:53 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:27:53 -0400 |
commit | c54f9da1c8ceee19436430afac0798a989eb886d (patch) | |
tree | 412f51c3f2641e4205b767cec95ce6107cd39d36 /arch/sh/Kconfig | |
parent | a2eddfa95919a730e0e5ed17e9c303fe5ba249cd (diff) | |
parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) |
Merge branch 'linus' into x86/irqstats
Diffstat (limited to 'arch/sh/Kconfig')
-rw-r--r-- | arch/sh/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 8a68160079a9..9a854c8e5274 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
@@ -281,7 +281,6 @@ config CPU_SUBTYPE_SH7723 | |||
281 | select CPU_SH4A | 281 | select CPU_SH4A |
282 | select CPU_SHX2 | 282 | select CPU_SHX2 |
283 | select ARCH_SPARSEMEM_ENABLE | 283 | select ARCH_SPARSEMEM_ENABLE |
284 | select SYS_SUPPORTS_NUMA | ||
285 | help | 284 | help |
286 | Select SH7723 if you have an SH-MobileR2 CPU. | 285 | Select SH7723 if you have an SH-MobileR2 CPU. |
287 | 286 | ||