summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/chips/Kconfig
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-07-19 23:49:39 +0200
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-07-19 23:49:39 +0200
commit39299d9d15c41cbdd7c7009967cd35afaf34d8fa (patch)
tree42a0c0408fcf76024eb6885a27d4f1ed0228abcf /drivers/mtd/chips/Kconfig
parentAUDIT: Reduce contention in audit_serial() (diff)
parentMerge master.kernel.org:/home/rmk/linux-2.6-serial (diff)
downloadlinux-39299d9d15c41cbdd7c7009967cd35afaf34d8fa.tar.xz
linux-39299d9d15c41cbdd7c7009967cd35afaf34d8fa.zip
Merge with /shiny/git/linux-2.6/.git
Diffstat (limited to 'drivers/mtd/chips/Kconfig')
-rw-r--r--drivers/mtd/chips/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/chips/Kconfig b/drivers/mtd/chips/Kconfig
index b5dc59389bb3..df95d2158b16 100644
--- a/drivers/mtd/chips/Kconfig
+++ b/drivers/mtd/chips/Kconfig
@@ -300,7 +300,7 @@ config MTD_JEDEC
config MTD_XIP
bool "XIP aware MTD support"
- depends on !SMP && (MTD_CFI_INTELEXT || MTD_CFI_AMDSTD) && EXPERIMENTAL
+ depends on !SMP && (MTD_CFI_INTELEXT || MTD_CFI_AMDSTD) && EXPERIMENTAL && ARM
default y if XIP_KERNEL
help
This allows MTD support to work with flash memory which is also