diff options
| author | Olof Johansson <olof@lixom.net> | 2015-08-05 10:35:54 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-08-05 10:35:54 +0200 |
| commit | 141a7bab2904461d834df3e91a63e88ed2535215 (patch) | |
| tree | 24685161cdb720e3ba56d94ba4042f098afd2f7e /arch/arm/configs | |
| parent | ARM: multi_v7_defconfig: Select MX6UL and MX7D (diff) | |
| parent | ARM: shmobile: Enable fixed voltage regulator in shmobile_defconfig (diff) | |
| download | linux-141a7bab2904461d834df3e91a63e88ed2535215.tar.xz linux-141a7bab2904461d834df3e91a63e88ed2535215.zip | |
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_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index 8da509327265..89bf31ccfbfa 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 |