diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2015-07-15 08:42:35 +0200 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2015-07-28 02:27:00 +0200 |
| commit | 4055a722d260ca30610fc52238d0aa49ff5bffa9 (patch) | |
| tree | f2d8675b1e96a3e8cdba9f150a440968c4f6e127 /arch/arm/configs/shmobile_defconfig | |
| parent | ARM: shmobile: Remove marzen_defconfig (diff) | |
| download | linux-4055a722d260ca30610fc52238d0aa49ff5bffa9.tar.xz linux-4055a722d260ca30610fc52238d0aa49ff5bffa9.zip | |
ARM: shmobile: Enable fixed voltage regulator in shmobile_defconfig
This is selected by MACH_MARZEN which is enabled in shmobile_defconfig,
however, MACH_MARZEN is going away along with the board code it enables.
Acked-by: Magnus Damm <damm@opensource.se>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/configs/shmobile_defconfig')
| -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 |