diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-13 08:32:54 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-13 08:32:54 -0400 |
| commit | dc2af52c0d6d00fd530e4a5e300834cdb1bb1c1c (patch) | |
| tree | 4573b99fb11e5b93bd011045039b370ddafe45e6 /arch/arm/configs/imx_v4_v5_defconfig | |
| parent | f1992dde7fef6713a469a5a142b86812b8a47f9e (diff) | |
| parent | 36be50515fe2aef61533b516fa2576a2c7fe7664 (diff) | |
Merge tag 'v3.4-rc7' into for-3.5
Linux 3.4-rc7
Conflicts):
drivers/base/regmap/regmap.c (overlap with bug fixes)
sound/soc/blackfin/bf5xx-ssm2602.c (overlap with bug fixes)
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 b5ac644e12af..6b31cb60daab 100644 --- a/arch/arm/configs/imx_v4_v5_defconfig +++ b/arch/arm/configs/imx_v4_v5_defconfig | |||
| @@ -112,6 +112,7 @@ CONFIG_WATCHDOG=y | |||
| 112 | CONFIG_IMX2_WDT=y | 112 | CONFIG_IMX2_WDT=y |
| 113 | CONFIG_MFD_MC13XXX=y | 113 | CONFIG_MFD_MC13XXX=y |
| 114 | CONFIG_REGULATOR=y | 114 | CONFIG_REGULATOR=y |
| 115 | CONFIG_REGULATOR_FIXED_VOLTAGE=y | ||
| 115 | CONFIG_REGULATOR_MC13783=y | 116 | CONFIG_REGULATOR_MC13783=y |
| 116 | CONFIG_REGULATOR_MC13892=y | 117 | CONFIG_REGULATOR_MC13892=y |
| 117 | CONFIG_FB=y | 118 | CONFIG_FB=y |