diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-09-28 22:20:39 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-09-28 22:20:39 +0100 |
| commit | 250d375d1da45a5e08ab8baf5eaa7eb258afd82b (patch) | |
| tree | fb5dc6df00065f11578f837835c6d5a99530b223 /arch/arm/Kconfig | |
| parent | 84904d0ead0a8c419abd45c7b2ac8d76d50a0d48 (diff) | |
| parent | 6afd6fae1d5f7e7129a10c4f3e32018966eeac1c (diff) | |
Merge nommu branch
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 147abe0383d8..f9362ee9955f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -99,7 +99,7 @@ config ARCH_MTD_XIP config VECTORS_BASE hex - default 0xffff0000 if MMU + default 0xffff0000 if MMU || CPU_HIGH_VECTOR default DRAM_BASE if REMAP_VECTORS_TO_RAM default 0x00000000 help @@ -626,6 +626,7 @@ config LEDS_CPU config ALIGNMENT_TRAP bool + depends on CPU_CP15_MMU default y if !ARCH_EBSA110 help ARM processors can not fetch/store information which is not @@ -857,7 +858,7 @@ source "drivers/base/Kconfig" source "drivers/connector/Kconfig" -if ALIGNMENT_TRAP +if ALIGNMENT_TRAP || !CPU_CP15_MMU source "drivers/mtd/Kconfig" endif |