diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 18:29:32 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 18:29:32 -0500 |
| commit | b93a4afcff7be859e30cad2a305731516057d6cf (patch) | |
| tree | fb5fe55864e16527e453efd18790a34db22ee2a1 /drivers/mtd | |
| parent | 62c132a8008991530839401674ce8e1b12b005d3 (diff) | |
| parent | 9b1489e989695c4d502865f8bec616c0f17e99ab (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Conflicts:
arch/arm/Makefile
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 677cd53f18c3..4f99274b24c2 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig | |||
| @@ -444,7 +444,7 @@ config MTD_NAND_FSL_UPM | |||
| 444 | 444 | ||
| 445 | config MTD_NAND_MXC | 445 | config MTD_NAND_MXC |
| 446 | tristate "MXC NAND support" | 446 | tristate "MXC NAND support" |
| 447 | depends on ARCH_MX2 || ARCH_MX3 | 447 | depends on ARCH_MX2 || ARCH_MX25 || ARCH_MX3 |
| 448 | help | 448 | help |
| 449 | This enables the driver for the NAND flash controller on the | 449 | This enables the driver for the NAND flash controller on the |
| 450 | MXC processors. | 450 | MXC processors. |