diff options
author | David Woodhouse | 2012-08-22 13:54:55 +0200 |
---|---|---|
committer | David Woodhouse | 2012-08-22 13:55:43 +0200 |
commit | 2361f738b67ab7f1152187fa3d321a09b7c95c09 (patch) | |
tree | eddf2b958215b668b9b871b6b59bc76c67a47751 /drivers/mtd/nand/Kconfig | |
parent | mtd: m25p80: Add support for serial flash STM/Micron N25Q032 (diff) | |
parent | Linux 3.6-rc2 (diff) | |
download | kernel-qcow2-linux-2361f738b67ab7f1152187fa3d321a09b7c95c09.tar.gz kernel-qcow2-linux-2361f738b67ab7f1152187fa3d321a09b7c95c09.tar.xz kernel-qcow2-linux-2361f738b67ab7f1152187fa3d321a09b7c95c09.zip |
Merge tag 'v3.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Having missed the merge window, update to 3.6-rc2 to avoid conflicts with
new patches.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/nand/Kconfig')
-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 f4e81a7742b8..588e98930aac 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -462,7 +462,7 @@ config MTD_NAND_NANDSIM config MTD_NAND_GPMI_NAND bool "GPMI NAND Flash Controller driver" - depends on MTD_NAND && (SOC_IMX23 || SOC_IMX28 || SOC_IMX6Q) + depends on MTD_NAND && MXS_DMA help Enables NAND Flash support for IMX23 or IMX28. The GPMI controller is very powerful, with the help of BCH |