diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-29 16:58:33 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-29 16:58:33 -0500 |
| commit | 467f7ad9f47c9da23c4c6c874a01fc22fd43b50f (patch) | |
| tree | 1eacbed5f2ab406cc4a4dad4ad227a6c012ffa57 /arch/arm | |
| parent | 49d3f3ccf413b2b3b7581921c2dac48a50fdf234 (diff) | |
| parent | 30aca3c84bd79b48154908b6c1592347f4df3d53 (diff) | |
Merge tag 'renesas-defconfig-fixes-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig
Merge "Renesas ARM Based SoC Defconfig Fixes for v3.20" from Simon Horman:
* Select CONFIG_REGULATOR in mach_shmobile defconfig once again
* tag 'renesas-defconfig-fixes-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: Select CONFIG_REGULATOR in defconfig once again
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/shmobile_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index 4f9868dc8c22..b553e2c45e86 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig | |||
| @@ -118,6 +118,7 @@ CONFIG_WATCHDOG=y | |||
| 118 | CONFIG_DA9063_WATCHDOG=y | 118 | CONFIG_DA9063_WATCHDOG=y |
| 119 | CONFIG_MFD_AS3711=y | 119 | CONFIG_MFD_AS3711=y |
| 120 | CONFIG_MFD_DA9063=y | 120 | CONFIG_MFD_DA9063=y |
| 121 | CONFIG_REGULATOR=y | ||
| 121 | CONFIG_REGULATOR_AS3711=y | 122 | CONFIG_REGULATOR_AS3711=y |
| 122 | CONFIG_REGULATOR_DA9210=y | 123 | CONFIG_REGULATOR_DA9210=y |
| 123 | CONFIG_REGULATOR_GPIO=y | 124 | CONFIG_REGULATOR_GPIO=y |