summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2015-01-23 07:55:16 +0000
committerSimon Horman <horms+renesas@verge.net.au>2015-01-26 16:14:04 +0900
commit30aca3c84bd79b48154908b6c1592347f4df3d53 (patch)
treeecc0f1a47d704707c59309cf0a928249586196b3 /arch/arm
parenteb4513482d1c4882e3633528ccc48d77581b7bb1 (diff)
downloadlinux-stable-30aca3c84bd79b48154908b6c1592347f4df3d53.tar.gz
linux-stable-30aca3c84bd79b48154908b6c1592347f4df3d53.tar.bz2
linux-stable-30aca3c84bd79b48154908b6c1592347f4df3d53.zip
ARM: shmobile: Select CONFIG_REGULATOR in defconfig once again
eb4513482d1c4882e3633528ccc48d77581b7bb1 (ARM: shmobile: Enable kzm9g board in multiplatform defconfig) dropped CONFIG_REGULATOR from shmobile_defconfig as it was generated using a tree where CONFIG_REGULATOR is indirectly selected by ARCH_SH73A0. ARCH_SH73A0 is not queued up for v3.20 and thus, baring unforeseen changes, CONFIG_REGULATOR will not be selected by shmobile_defconfig in that release. This causes at least SDHI to stop working on R-Car Gen2 SoCs. Reported-by: Magnus Damm <damm+renesas@opensource.se> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> [horms: minimal patch targeted as a fix] Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/shmobile_defconfig1
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
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