summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-10-15 08:26:56 +0200
committerOlof Johansson <olof@lixom.net>2014-10-15 08:26:58 +0200
commit9a2ad529ed26c4dd81368d0bc87fc77db1febb35 (patch)
tree5eb94b95d1e57d0de97c693ce3c341ea0da11af1 /arch
parentMerge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/... (diff)
downloadlinux-9a2ad529ed26c4dd81368d0bc87fc77db1febb35.tar.xz
linux-9a2ad529ed26c4dd81368d0bc87fc77db1febb35.zip
ARM: sunxi_defconfig: enable CONFIG_REGULATOR
Commit 97a13e5289ba ('net: phy: mdio-sun4i: don't select REGULATOR') removed the select of REGULATOR, which means that it now has to be explicitly enabled in the defconfig or things won't work very well. In particular, this fixes a problem with SD/MMC not probing on my A31-based board. Cc: Beniamino Galvani <b.galvani@gmail.com> 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 c1a4ca4f6e6d..847045313101 100644
--- a/arch/arm/configs/sunxi_defconfig
+++ b/arch/arm/configs/sunxi_defconfig
@@ -75,6 +75,7 @@ CONFIG_POWER_RESET_SUN6I=y
CONFIG_WATCHDOG=y
CONFIG_SUNXI_WATCHDOG=y
CONFIG_MFD_AXP20X=y
+CONFIG_REGULATOR=y
CONFIG_REGULATOR_GPIO=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y