diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 07:58:59 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 07:59:03 -0500 |
| commit | d0cdd82c6e0944df733b28f5d4cbbe97298587e4 (patch) | |
| tree | 9de205625a4657fedbfae52c65ea017beb7509a8 /arch/arm/configs | |
| parent | 747303a383d59a4d4667152fb68293dd9ff06438 (diff) | |
| parent | 9418ba306688c0b77a8548b3281ba3d130036516 (diff) | |
Merge branch 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into next/fixes-non-critical
* 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6: (247 commits)
ARM: mach-imx: mx3: Fix section mismatch in imx3_init_l2x0()
ARM: imx_v4_v5_defconfig: Fix the selection of 32 bit flash support for iMX21ADS board
ARM: mach-pcm038: Fix field name of regulator_consumer_supply struct
Also includes an update to v3.3-rc3
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/imx_v4_v5_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig index a22e93079063..d88fb87b414d 100644 --- a/arch/arm/configs/imx_v4_v5_defconfig +++ b/arch/arm/configs/imx_v4_v5_defconfig | |||
| @@ -68,6 +68,7 @@ CONFIG_MTD_CFI=y | |||
| 68 | CONFIG_MTD_CFI_ADV_OPTIONS=y | 68 | CONFIG_MTD_CFI_ADV_OPTIONS=y |
| 69 | CONFIG_MTD_CFI_GEOMETRY=y | 69 | CONFIG_MTD_CFI_GEOMETRY=y |
| 70 | # CONFIG_MTD_MAP_BANK_WIDTH_1 is not set | 70 | # CONFIG_MTD_MAP_BANK_WIDTH_1 is not set |
| 71 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
| 71 | # CONFIG_MTD_CFI_I2 is not set | 72 | # CONFIG_MTD_CFI_I2 is not set |
| 72 | CONFIG_MTD_CFI_INTELEXT=y | 73 | CONFIG_MTD_CFI_INTELEXT=y |
| 73 | CONFIG_MTD_PHYSMAP=y | 74 | CONFIG_MTD_PHYSMAP=y |