diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 17:06:09 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 17:06:09 +0100 |
commit | 423ab71a8bd2345f87724abe320092a3a516b0bb (patch) | |
tree | 5d5eb306001e4341c3c073777f4d0b9e05ccd454 /arch/arm | |
parent | Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block (diff) | |
parent | [PATCH] sh: lvalues abuse in arch/sh/boards/renesas/rts7751r2d/io.c (diff) | |
download | linux-423ab71a8bd2345f87724abe320092a3a516b0bb.tar.xz linux-423ab71a8bd2345f87724abe320092a3a516b0bb.zip |
Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird
Diffstat (limited to 'arch/arm')
-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 5959e36c3b4c..4a63a8e2e452 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -69,6 +69,9 @@ config GENERIC_ISA_DMA config FIQ bool +config ARCH_MTD_XIP + bool + source "init/Kconfig" menu "System Type" @@ -136,6 +139,7 @@ config ARCH_L7200 config ARCH_PXA bool "PXA2xx-based" + select ARCH_MTD_XIP config ARCH_RPC bool "RiscPC" @@ -152,6 +156,7 @@ config ARCH_SA1100 bool "SA1100-based" select ISA select ARCH_DISCONTIGMEM_ENABLE + select ARCH_MTD_XIP config ARCH_S3C2410 bool "Samsung S3C2410" |