diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-10 08:53:29 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-10 08:53:29 -0500 |
| commit | 3afdb0f3528991de0833224f2dba60dc061e01fa (patch) | |
| tree | 0d9c7529c6cc2b41f0df778cc396edd74699721a /drivers/mtd | |
| parent | 71d8c5b11e3b5936ae6c2e0b1dd6f5c78b305b65 (diff) | |
| parent | f7fdaca910e6bc13659ecdffc28c97938b752e01 (diff) | |
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 c89592239bc..450afc5df0b 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig | |||
| @@ -476,7 +476,7 @@ config MTD_NAND_MPC5121_NFC | |||
| 476 | 476 | ||
| 477 | config MTD_NAND_MXC | 477 | config MTD_NAND_MXC |
| 478 | tristate "MXC NAND support" | 478 | tristate "MXC NAND support" |
| 479 | depends on ARCH_MX2 || ARCH_MX25 || ARCH_MX3 || ARCH_MX51 | 479 | depends on IMX_HAVE_PLATFORM_MXC_NAND |
| 480 | help | 480 | help |
| 481 | This enables the driver for the NAND flash controller on the | 481 | This enables the driver for the NAND flash controller on the |
| 482 | MXC processors. | 482 | MXC processors. |