summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-10-19 14:29:14 -0700
committerOlof Johansson <olof@lixom.net>2014-10-23 21:00:52 -0700
commit3e10dccc82baaf243114d046d9757d7f368cdfb5 (patch)
tree01efdf47d81f1544aed44b6d680b1c543ff1fd8d /arch
parentf114040e3ea6e07372334ade75d1ee0775c355e1 (diff)
downloadlinux-stable-3e10dccc82baaf243114d046d9757d7f368cdfb5.tar.gz
linux-stable-3e10dccc82baaf243114d046d9757d7f368cdfb5.tar.bz2
linux-stable-3e10dccc82baaf243114d046d9757d7f368cdfb5.zip
ARM: sunxi_defconfig: enable CONFIG_REGULATOR_FIXED_VOLTAGE
I missed in 9a2ad529ed26 that REGULATOR_FIXED_VOLTAGE had also gotten deselected, so it needs to be added back as an explicit option. Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/sunxi_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig
index 847045313101..f7ac0379850f 100644
--- a/arch/arm/configs/sunxi_defconfig
+++ b/arch/arm/configs/sunxi_defconfig
@@ -76,6 +76,7 @@ CONFIG_WATCHDOG=y
CONFIG_SUNXI_WATCHDOG=y
CONFIG_MFD_AXP20X=y
CONFIG_REGULATOR=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_REGULATOR_GPIO=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y