commit e06b2d86215a535d0f652c845c53b6825f58b9d8
author Olof Johansson <olof@lixom.net> Wed Aug 05 10:46:31 2015 +0200
committer Olof Johansson <olof@lixom.net> Wed Aug 05 10:46:31 2015 +0200
tree 46bbc5aef17a9d24b35fc50632e2f52104c40c76
parent d323c85ce52b2ef9800ab1e4196fc4d784319de0
parent 142f2610d525c23afa5ba5e4e535504bea8b04b9

Merge tag 'qcom-defconfig-for-4.3' of git://codeaurora.org/quic/kernel/agross-msm into next/defconfig

Qualcomm ARM Based defconfig Updates for v4.3

* Enable KS8851 for QCOM SoCs in qcom defconfig

* tag 'qcom-defconfig-for-4.3' of git://codeaurora.org/quic/kernel/agross-msm:
  ARM: qcom_defconfig: Enable options for KS8851 ethernet

Signed-off-by: Olof Johansson <olof@lixom.net>

arch/arm/configs/qcom_defconfig

diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig
index e6a6f28..ff7985b 100644
--- a/arch/arm/configs/qcom_defconfig
+++ b/arch/arm/configs/qcom_defconfig
@@ -67,6 +67,7 @@
 CONFIG_SCSI_SCAN_ASYNC=y
 CONFIG_NETDEVICES=y
 CONFIG_DUMMY=y
+CONFIG_KS8851=y
 CONFIG_MDIO_BITBANG=y
 CONFIG_MDIO_GPIO=y
 CONFIG_SLIP=y
@@ -104,8 +105,10 @@
 CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_MSM=y
 CONFIG_THERMAL=y
+CONFIG_MFD_QCOM_RPM=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_REGULATOR_QCOM_RPM=y
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_FB=y
 CONFIG_SOUND=y