diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-30 23:33:39 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-30 23:33:39 -0400 |
| commit | 61c324b4c107147b4d4b47bb0f2e1c4d1008a4a1 (patch) | |
| tree | 6dd289d76abeb517691a8e14c430fabe3777966c | |
| parent | 4cff2a24797ea63d57dcbcdbea8d5020876ee51d (diff) | |
| parent | 15ce39ade232bdac9fb788c66da9bcc7eb1a46a9 (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>
| -rw-r--r-- | arch/arm/configs/qcom_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig index bfed75376215..42ebd72799e6 100644 --- a/arch/arm/configs/qcom_defconfig +++ b/arch/arm/configs/qcom_defconfig | |||
| @@ -131,6 +131,7 @@ CONFIG_RTC_CLASS=y | |||
| 131 | CONFIG_DMADEVICES=y | 131 | CONFIG_DMADEVICES=y |
| 132 | CONFIG_QCOM_BAM_DMA=y | 132 | CONFIG_QCOM_BAM_DMA=y |
| 133 | CONFIG_STAGING=y | 133 | CONFIG_STAGING=y |
| 134 | CONFIG_QCOM_GSBI=y | ||
| 134 | CONFIG_COMMON_CLK_QCOM=y | 135 | CONFIG_COMMON_CLK_QCOM=y |
| 135 | CONFIG_MSM_GCC_8660=y | 136 | CONFIG_MSM_GCC_8660=y |
| 136 | CONFIG_MSM_MMCC_8960=y | 137 | CONFIG_MSM_MMCC_8960=y |