diff options
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/Kconfig | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 3468d5127223..ac2b865359b2 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
@@ -486,7 +486,7 @@ config CPU_SUBTYPE_ST40 | |||
486 | depends on CPU_SUBTYPE_ST40STB1 || CPU_SUBTYPE_ST40GX1 | 486 | depends on CPU_SUBTYPE_ST40STB1 || CPU_SUBTYPE_ST40GX1 |
487 | default y | 487 | default y |
488 | 488 | ||
489 | config DISCONTIGMEM | 489 | config ARCH_DISCONTIGMEM_ENABLE |
490 | bool | 490 | bool |
491 | depends on SH_HP690 | 491 | depends on SH_HP690 |
492 | default y | 492 | default y |
@@ -496,6 +496,12 @@ config DISCONTIGMEM | |||
496 | or have huge holes in the physical address space for other reasons. | 496 | or have huge holes in the physical address space for other reasons. |
497 | See <file:Documentation/vm/numa> for more. | 497 | See <file:Documentation/vm/numa> for more. |
498 | 498 | ||
499 | config ARCH_FLATMEM_DISABLE | ||
500 | def_bool y | ||
501 | depends on ARCH_DISCONTIGMEM_ENABLE | ||
502 | |||
503 | source "mm/Kconfig" | ||
504 | |||
499 | config ZERO_PAGE_OFFSET | 505 | config ZERO_PAGE_OFFSET |
500 | hex "Zero page offset" | 506 | hex "Zero page offset" |
501 | default "0x00001000" if !(SH_MPC1211 || SH_SH03) | 507 | default "0x00001000" if !(SH_MPC1211 || SH_SH03) |