Skip to content

Commit

Permalink
Merge tag 'renesas-defconfig2-for-v4.3' of git://git.kernel.org/pub/s…
Browse files Browse the repository at this point in the history 
…cm/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>
  • Loading branch information
Olof Johansson committed Aug 5, 2015
2 parents 27e50c9 + 4055a72 commit 141a7ba
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions arch/arm/configs/shmobile_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 141a7ba

Please sign in to comment.