瀏覽代碼

Merge tag 'renesas-defconfig-fixes-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig

Merge "Renesas ARM Based SoC Defconfig Fixes for v3.20" from Simon Horman:

* Select CONFIG_REGULATOR in mach_shmobile defconfig once again

* tag 'renesas-defconfig-fixes-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Select CONFIG_REGULATOR in defconfig once again

Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson 10 年之前
父節點
當前提交
467f7ad9f4
共有 1 個文件被更改,包括 1 次插入0 次删除
  1. 1 0
      arch/arm/configs/shmobile_defconfig

+ 1 - 0
arch/arm/configs/shmobile_defconfig

@@ -118,6 +118,7 @@ CONFIG_WATCHDOG=y
 CONFIG_DA9063_WATCHDOG=y
 CONFIG_MFD_AS3711=y
 CONFIG_MFD_DA9063=y
+CONFIG_REGULATOR=y
 CONFIG_REGULATOR_AS3711=y
 CONFIG_REGULATOR_DA9210=y
 CONFIG_REGULATOR_GPIO=y