diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2015-07-15 02:42:35 -0400 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2015-07-27 20:27:00 -0400 |
| commit | 4055a722d260ca30610fc52238d0aa49ff5bffa9 (patch) | |
| tree | f2d8675b1e96a3e8cdba9f150a440968c4f6e127 | |
| parent | 821e79cb5686695f0adaef61587a184e953a937e (diff) | |
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>
| -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 | |||
| 122 | CONFIG_DA9063_WATCHDOG=y | 122 | CONFIG_DA9063_WATCHDOG=y |
| 123 | CONFIG_MFD_AS3711=y | 123 | CONFIG_MFD_AS3711=y |
| 124 | CONFIG_MFD_DA9063=y | 124 | CONFIG_MFD_DA9063=y |
| 125 | CONFIG_REGULATOR_FIXED_VOLTAGE=y | ||
| 125 | CONFIG_REGULATOR_AS3711=y | 126 | CONFIG_REGULATOR_AS3711=y |
| 126 | CONFIG_REGULATOR_DA9210=y | 127 | CONFIG_REGULATOR_DA9210=y |
| 127 | CONFIG_REGULATOR_GPIO=y | 128 | CONFIG_REGULATOR_GPIO=y |