Merge tag 'qcom-defconfig-for-4.3' of git://codeaurora.org/quic/kerne…

…l/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

@@ -67,6 +67,7 @@ CONFIG_SCSI_LOGGING=y
 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_GPIO_SYSFS=y
 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