diff options
author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-19 23:49:39 +0200 |
---|---|---|
committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-19 23:49:39 +0200 |
commit | 39299d9d15c41cbdd7c7009967cd35afaf34d8fa (patch) | |
tree | 42a0c0408fcf76024eb6885a27d4f1ed0228abcf /drivers/mtd/chips/Kconfig | |
parent | AUDIT: Reduce contention in audit_serial() (diff) | |
parent | Merge master.kernel.org:/home/rmk/linux-2.6-serial (diff) | |
download | linux-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/Kconfig | 2 |
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 |