diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-01-21 21:26:51 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-01-21 21:26:51 +0000 |
| commit | 857989a7fdd2f6de42272578b8aaa413ed6e63e4 (patch) | |
| tree | 21c941d63000fdaa0ea32d34087b53d41b5919f8 /arch/arm/Kconfig | |
| parent | 6f14d778c15fe08b6d98e759cf7e3893ed67b238 (diff) | |
| parent | 7990ac9cb25d378b6311f3591f010e53a9967066 (diff) | |
| download | linux-857989a7fdd2f6de42272578b8aaa413ed6e63e4.tar.gz linux-857989a7fdd2f6de42272578b8aaa413ed6e63e4.tar.bz2 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 |