Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 467f7ad9 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-defconfig-fixes-for-v3.20' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents 49d3f3cc 30aca3c8

arch/arm/configs/shmobile_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ CONFIG_WATCHDOG=y 
CONFIG_DA9063_WATCHDOG=y

CONFIG_MFD_AS3711=y

CONFIG_MFD_DA9063=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_AS3711=y

CONFIG_REGULATOR_DA9210=y

CONFIG_REGULATOR_GPIO=y