diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:31:56 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:31:56 -0400 |
| commit | 6a4690c22f5da1eb1c898b61b6a80da52fbd976f (patch) | |
| tree | a03891a32abe0da191fb765fe669a597e07423c6 /arch/arm/Kconfig | |
| parent | 90bb28b0644f7324f8bd1feb27b35146e6785ba2 (diff) | |
| parent | 8ec53663d2698076468b3e1edc4e1b418bd54de3 (diff) | |
Merge branch 'ptebits' into devel
Conflicts:
arch/arm/Kconfig
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 ea52fae33290..744d07e69602 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -843,6 +843,11 @@ config OABI_COMPAT | |||
| 843 | UNPREDICTABLE (in fact it can be predicted that it won't work | 843 | UNPREDICTABLE (in fact it can be predicted that it won't work |
| 844 | at all). If in doubt say Y. | 844 | at all). If in doubt say Y. |
| 845 | 845 | ||
| 846 | config ARCH_FLATMEM_HAS_HOLES | ||
| 847 | bool | ||
| 848 | default y | ||
| 849 | depends on FLATMEM | ||
| 850 | |||
| 846 | # Discontigmem is deprecated | 851 | # Discontigmem is deprecated |
| 847 | config ARCH_DISCONTIGMEM_ENABLE | 852 | config ARCH_DISCONTIGMEM_ENABLE |
| 848 | bool | 853 | bool |