diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-08 13:02:04 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-08 13:02:04 -0500 |
| commit | 6ae25a5b9d7ba86d6ac19c403dfa57dae6caa73d (patch) | |
| tree | 41d04269f268d6162e5f1866496dd42fbc79d2a4 /arch/arm/Kconfig | |
| parent | 3ee0fc5ca129cbae81c073756febcb1c552af446 (diff) | |
| parent | 497b7e943d0dc5743454de56dcdb67352bbf96b2 (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux into devel-stable
Conflicts:
arch/arm/mm/ioremap.c
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e084b7e981e8..4b01d71bdbd1 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -1971,7 +1971,7 @@ endchoice | |||
| 1971 | 1971 | ||
| 1972 | config XIP_KERNEL | 1972 | config XIP_KERNEL |
| 1973 | bool "Kernel Execute-In-Place from ROM" | 1973 | bool "Kernel Execute-In-Place from ROM" |
| 1974 | depends on !ZBOOT_ROM | 1974 | depends on !ZBOOT_ROM && !ARM_LPAE |
| 1975 | help | 1975 | help |
| 1976 | Execute-In-Place allows the kernel to run from non-volatile storage | 1976 | Execute-In-Place allows the kernel to run from non-volatile storage |
| 1977 | directly addressable by the CPU, such as NOR flash. This saves RAM | 1977 | directly addressable by the CPU, such as NOR flash. This saves RAM |