diff options
| author | Olof Johansson <olof@lixom.net> | 2013-12-22 14:19:47 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-12-22 14:19:47 -0800 |
| commit | a80ffa191b093129e184c7e06ef718a3937f2075 (patch) | |
| tree | 2c5cb756d09c5357915390e1d3cba6867efc65ea /arch/arm/configs | |
| parent | 103e76b3d6dadb7e3d610c67131020d9bdb35fa7 (diff) | |
| parent | 4427944b71a436785b95da95ac61520b2ac8053f (diff) | |
Merge tag 'mvebu-defconfig-3.14-2' of git://git.infradead.org/linux-mvebu into next/boards
From Jason Cooper:
mvebu defconfig changes for v3.14 (incremental #2)
- mvebu
- enable nand support
* tag 'mvebu-defconfig-3.14-2' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: config: Enable NAND support
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/mvebu_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/mvebu_defconfig b/arch/arm/configs/mvebu_defconfig index 6fcb5c88a64..0f4511d2849 100644 --- a/arch/arm/configs/mvebu_defconfig +++ b/arch/arm/configs/mvebu_defconfig @@ -55,6 +55,8 @@ CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_CFI_AMDSTD=y CONFIG_MTD_CFI_STAA=y CONFIG_MTD_PHYSMAP_OF=y +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_PXA3xx=y CONFIG_SERIAL_8250_DW=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y |