diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-20 18:42:24 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-20 18:42:24 -0400 |
| commit | f907ab06bb021bcb91d39c8d1b36536ebdb318fa (patch) | |
| tree | 6020618997a6ea1b5f5b59c89df35344023f7c82 /arch/arm/configs/imx_v4_v5_defconfig | |
| parent | 7cc026f21e2acdcea8640df5da470c6fdca92911 (diff) | |
| parent | 489e7bece7f6859a7df484a4dce08fa51fb0d876 (diff) | |
Merge branch 'next/fixes-non-critical' into next/drivers
Conflicts:
arch/arm/mach-lpc32xx/clock.c
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c
The conflicts with pxa are non-obvious, we have multiple branches
adding and removing the same clock settings. According to
Haojian Zhuang, removing the sa1100 rtc dummy clock is the correct
fix here.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs/imx_v4_v5_defconfig')
| -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 d9eddfd77428..b5ac644e12af 100644 --- a/arch/arm/configs/imx_v4_v5_defconfig +++ b/arch/arm/configs/imx_v4_v5_defconfig | |||
| @@ -69,6 +69,7 @@ CONFIG_MTD_CFI=y | |||
| 69 | CONFIG_MTD_CFI_ADV_OPTIONS=y | 69 | CONFIG_MTD_CFI_ADV_OPTIONS=y |
| 70 | CONFIG_MTD_CFI_GEOMETRY=y | 70 | CONFIG_MTD_CFI_GEOMETRY=y |
| 71 | # CONFIG_MTD_MAP_BANK_WIDTH_1 is not set | 71 | # CONFIG_MTD_MAP_BANK_WIDTH_1 is not set |
| 72 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
| 72 | # CONFIG_MTD_CFI_I2 is not set | 73 | # CONFIG_MTD_CFI_I2 is not set |
| 73 | CONFIG_MTD_CFI_INTELEXT=y | 74 | CONFIG_MTD_CFI_INTELEXT=y |
| 74 | CONFIG_MTD_PHYSMAP=y | 75 | CONFIG_MTD_PHYSMAP=y |