diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-06 10:51:57 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-06 10:51:57 -0400 |
| commit | 7f79d852ed30a06eebf7497afe9334a726db3d40 (patch) | |
| tree | 0057281f17501b635d3d88cda9a14203706f5dcc /arch/arm/Kconfig | |
| parent | aef745fca016aea45adae5c98e8698904dd8ad51 (diff) | |
| parent | 70bb08962ea9bd50797ae9f16b2493f5f7c65053 (diff) | |
Merge branch 'linus' into sched/devel
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 4b8acd2851f4..70dba1668907 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -810,6 +810,11 @@ config OABI_COMPAT | |||
| 810 | UNPREDICTABLE (in fact it can be predicted that it won't work | 810 | UNPREDICTABLE (in fact it can be predicted that it won't work |
| 811 | at all). If in doubt say Y. | 811 | at all). If in doubt say Y. |
| 812 | 812 | ||
| 813 | config ARCH_FLATMEM_HAS_HOLES | ||
| 814 | bool | ||
| 815 | default y | ||
| 816 | depends on FLATMEM | ||
| 817 | |||
| 813 | config ARCH_DISCONTIGMEM_ENABLE | 818 | config ARCH_DISCONTIGMEM_ENABLE |
| 814 | bool | 819 | bool |
| 815 | default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM) | 820 | default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM) |