summaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-03-10 13:53:29 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-03-10 13:53:29 +0000
commit3afdb0f3528991de0833224f2dba60dc061e01fa (patch)
tree0d9c7529c6cc2b41f0df778cc396edd74699721a /drivers/mtd
parent71d8c5b11e3b5936ae6c2e0b1dd6f5c78b305b65 (diff)
parentf7fdaca910e6bc13659ecdffc28c97938b752e01 (diff)
downloadlinux-stable-3afdb0f3528991de0833224f2dba60dc061e01fa.tar.gz
linux-stable-3afdb0f3528991de0833224f2dba60dc061e01fa.tar.bz2
linux-stable-3afdb0f3528991de0833224f2dba60dc061e01fa.zip
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/nand/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index c89592239bc7..450afc5df0bd 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -476,7 +476,7 @@ config MTD_NAND_MPC5121_NFC
config MTD_NAND_MXC
tristate "MXC NAND support"
- depends on ARCH_MX2 || ARCH_MX25 || ARCH_MX3 || ARCH_MX51
+ depends on IMX_HAVE_PLATFORM_MXC_NAND
help
This enables the driver for the NAND flash controller on the
MXC processors.