summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2015-08-05 10:35:54 +0200
committerOlof Johansson <olof@lixom.net>2015-08-05 10:35:54 +0200
commit141a7bab2904461d834df3e91a63e88ed2535215 (patch)
tree24685161cdb720e3ba56d94ba4042f098afd2f7e /arch/arm/configs
parent27e50c9708263995e8bbb2843a5d1a264e1dfe4d (diff)
parent4055a722d260ca30610fc52238d0aa49ff5bffa9 (diff)
downloadop-kernel-dev-141a7bab2904461d834df3e91a63e88ed2535215.zip
op-kernel-dev-141a7bab2904461d834df3e91a63e88ed2535215.tar.gz
Merge tag 'renesas-defconfig2-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig
Second Round of Renesas ARM Based SoC Defconfig Updates for v4.3 * Enable fixed voltage regulator in shmobile_defconfig * tag 'renesas-defconfig2-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: Enable fixed voltage regulator in shmobile_defconfig Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
-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 8da5093..89bf31c 100644
--- a/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
@@ -122,6 +122,7 @@ CONFIG_WATCHDOG=y
CONFIG_DA9063_WATCHDOG=y
CONFIG_MFD_AS3711=y
CONFIG_MFD_DA9063=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_REGULATOR_AS3711=y
CONFIG_REGULATOR_DA9210=y
CONFIG_REGULATOR_GPIO=y
OpenPOWER on IntegriCloud