diff options
| author | Russell King | 2014-01-21 22:26:51 +0100 |
|---|---|---|
| committer | Russell King | 2014-01-21 22:26:51 +0100 |
| commit | 857989a7fdd2f6de42272578b8aaa413ed6e63e4 (patch) | |
| tree | 21c941d63000fdaa0ea32d34087b53d41b5919f8 /arch/arm/Kconfig | |
| parent | Merge branches 'amba', 'fixes', 'kees', 'misc' and 'unstable/sa11x0' into for... (diff) | |
| parent | Merge branch 'for_3.14/arm-no-bootmem' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| download | kernel-qcow2-linux-857989a7fdd2f6de42272578b8aaa413ed6e63e4.tar.gz kernel-qcow2-linux-857989a7fdd2f6de42272578b8aaa413ed6e63e4.tar.xz kernel-qcow2-linux-857989a7fdd2f6de42272578b8aaa413ed6e63e4.zip | |
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f219c30eb4e1..c2dbf1416b94 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -64,6 +64,7 @@ config ARM select IRQ_FORCED_THREADING select KTIME_SCALAR select MODULES_USE_ELF_REL + select NO_BOOTMEM select OLD_SIGACTION select OLD_SIGSUSPEND3 select PERF_USE_VMALLOC |