mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Conflicts: arch/arm/Makefile
This commit is contained in:
commit
b93a4afcff
123 changed files with 7603 additions and 3235 deletions
|
|
@ -444,7 +444,7 @@ config MTD_NAND_FSL_UPM
|
|||
|
||||
config MTD_NAND_MXC
|
||||
tristate "MXC NAND support"
|
||||
depends on ARCH_MX2 || ARCH_MX3
|
||||
depends on ARCH_MX2 || ARCH_MX25 || ARCH_MX3
|
||||
help
|
||||
This enables the driver for the NAND flash controller on the
|
||||
MXC processors.
|
||||
|
|
|
|||
Loading…
Reference in a new issue