diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-10 14:53:29 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-10 14:53:29 +0100 |
commit | 3afdb0f3528991de0833224f2dba60dc061e01fa (patch) | |
tree | 0d9c7529c6cc2b41f0df778cc396edd74699721a /drivers/mtd | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable (diff) | |
parent | arm: imx: Zero entire imxdma structure (diff) | |
download | linux-3afdb0f3528991de0833224f2dba60dc061e01fa.tar.xz linux-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/Kconfig | 2 |
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. |