diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 08:06:09 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 08:06:09 -0800 |
commit | 423ab71a8bd2345f87724abe320092a3a516b0bb (patch) | |
tree | 5d5eb306001e4341c3c073777f4d0b9e05ccd454 /drivers/mtd/chips/Kconfig | |
parent | b7ed1de0ae4edb3fd2c53fa3dd7e6f104beb6d00 (diff) | |
parent | 63f716b9419420defb3e550a1e5f526c11b2ed2d (diff) |
Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird
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 effa0d7a73a..205bb708333 100644 --- a/drivers/mtd/chips/Kconfig +++ b/drivers/mtd/chips/Kconfig @@ -301,7 +301,7 @@ config MTD_JEDEC config MTD_XIP bool "XIP aware MTD support" - depends on !SMP && (MTD_CFI_INTELEXT || MTD_CFI_AMDSTD) && EXPERIMENTAL && ARM + depends on !SMP && (MTD_CFI_INTELEXT || MTD_CFI_AMDSTD) && EXPERIMENTAL && ARCH_MTD_XIP default y if XIP_KERNEL help This allows MTD support to work with flash memory which is also |