diff options
author | Russell King | 2008-10-09 22:31:56 +0200 |
---|---|---|
committer | Russell King | 2008-10-09 22:31:56 +0200 |
commit | 6a4690c22f5da1eb1c898b61b6a80da52fbd976f (patch) | |
tree | a03891a32abe0da191fb765fe669a597e07423c6 /arch/arm/Kconfig | |
parent | Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100'... (diff) | |
parent | [ARM] Improve non-executable support (diff) | |
download | kernel-qcow2-linux-6a4690c22f5da1eb1c898b61b6a80da52fbd976f.tar.gz kernel-qcow2-linux-6a4690c22f5da1eb1c898b61b6a80da52fbd976f.tar.xz kernel-qcow2-linux-6a4690c22f5da1eb1c898b61b6a80da52fbd976f.zip |
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 UNPREDICTABLE (in fact it can be predicted that it won't work at all). If in doubt say Y. +config ARCH_FLATMEM_HAS_HOLES + bool + default y + depends on FLATMEM + # Discontigmem is deprecated config ARCH_DISCONTIGMEM_ENABLE bool |