summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-05-30 20:33:39 -0700
committerOlof Johansson <olof@lixom.net>2014-05-30 20:33:39 -0700
commit61c324b4c107147b4d4b47bb0f2e1c4d1008a4a1 (patch)
tree6dd289d76abeb517691a8e14c430fabe3777966c /arch/arm
parent4cff2a24797ea63d57dcbcdbea8d5020876ee51d (diff)
parent15ce39ade232bdac9fb788c66da9bcc7eb1a46a9 (diff)
Merge tag 'qcom-defconfig-for-3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/defconfig
Merge "Qualcomm ARM Based defconfig Updates for v3.16-2" from Kumar Gala: * Enable qcom GSBI driver * tag 'qcom-defconfig-for-3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom: ARM: qcom: Enable GSBI driver in defconfig Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/qcom_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig
index bfed7537621..42ebd72799e 100644
--- a/arch/arm/configs/qcom_defconfig
+++ b/arch/arm/configs/qcom_defconfig
@@ -131,6 +131,7 @@ CONFIG_RTC_CLASS=y
CONFIG_DMADEVICES=y
CONFIG_QCOM_BAM_DMA=y
CONFIG_STAGING=y
+CONFIG_QCOM_GSBI=y
CONFIG_COMMON_CLK_QCOM=y
CONFIG_MSM_GCC_8660=y
CONFIG_MSM_MMCC_8960=y