diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-03-04 09:21:49 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-03-04 09:21:49 +0100 |
commit | 62ee96bd3b5e02173c0d9956c4f1e1a4de8f940d (patch) | |
tree | 1c9d519fb35c8c599bb31c4ee836f3ac135d933d /arch/arm/configs/eukrea_cpuimx27_defconfig | |
parent | 13408877f4c0d4b2784d3388dd4481369205e46a (diff) | |
parent | ef06284cd947c4e90a54a62d2c106789c6eaebe8 (diff) | |
download | barebox-62ee96bd3b5e02173c0d9956c4f1e1a4de8f940d.tar.gz barebox-62ee96bd3b5e02173c0d9956c4f1e1a4de8f940d.tar.xz |
Merge branch 'for-next/mtd'
Conflicts:
arch/arm/configs/eukrea_cpuimx27_defconfig
drivers/mtd/core.c
Diffstat (limited to 'arch/arm/configs/eukrea_cpuimx27_defconfig')
-rw-r--r-- | arch/arm/configs/eukrea_cpuimx27_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/eukrea_cpuimx27_defconfig b/arch/arm/configs/eukrea_cpuimx27_defconfig index c751d1cef..bbcd454e3 100644 --- a/arch/arm/configs/eukrea_cpuimx27_defconfig +++ b/arch/arm/configs/eukrea_cpuimx27_defconfig @@ -46,6 +46,7 @@ CONFIG_DRIVER_NET_FEC_IMX=y CONFIG_I2C=y CONFIG_I2C_IMX=y CONFIG_MFD_LP3972=y +CONFIG_MTD=y CONFIG_DRIVER_CFI=y # CONFIG_DRIVER_CFI_AMD is not set # CONFIG_DRIVER_CFI_BANK_WIDTH_1 is not set |