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 <[email protected]>
xlks · Jan 29, 2015 · 467f7ad · 467f7ad
2 parents 49d3f3c + 30aca3c
commit 467f7ad
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
@@ -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