diff options
author | Olof Johansson <olof@lixom.net> | 2015-08-13 15:05:06 +0200 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2015-08-13 15:05:06 +0200 |
commit | 0bf413558eb5668fe92b1a1931dc26b0df5908ae (patch) | |
tree | 57462ef8a3b01c556ddd5efb46ff083b10a560bf /drivers/soc/qcom/Makefile | |
parent | Merge tag 'mvebu-soc-4.3-2' of git://git.infradead.org/linux-mvebu into next/... (diff) | |
parent | devicetree: soc: Add Qualcomm SMD based RPM DT binding (diff) | |
download | linux-0bf413558eb5668fe92b1a1931dc26b0df5908ae.tar.xz linux-0bf413558eb5668fe92b1a1931dc26b0df5908ae.zip |
Merge tag 'qcom-soc-for-4.3' of git://codeaurora.org/quic/kernel/agross-msm into next/drivers
Qualcomm ARM Based SoC Updates for 4.3
* Add SMEM driver
* Add SMD driver
* Add RPM over SMD driver
* Select QCOM_SCM by default
* tag 'qcom-soc-for-4.3' of git://codeaurora.org/quic/kernel/agross-msm:
devicetree: soc: Add Qualcomm SMD based RPM DT binding
soc: qcom: Driver for the Qualcomm RPM over SMD
soc: qcom: Add Shared Memory Driver
soc: qcom: Add device tree binding for Shared Memory Device
drivers: qcom: Select QCOM_SCM unconditionally for QCOM_PM
soc: qcom: Add Shared Memory Manager driver
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/soc/qcom/Makefile')
-rw-r--r-- | drivers/soc/qcom/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile index 931d385386c5..10a93d168e0e 100644 --- a/drivers/soc/qcom/Makefile +++ b/drivers/soc/qcom/Makefile @@ -1,2 +1,5 @@ obj-$(CONFIG_QCOM_GSBI) += qcom_gsbi.o obj-$(CONFIG_QCOM_PM) += spm.o +obj-$(CONFIG_QCOM_SMD) += smd.o +obj-$(CONFIG_QCOM_SMD_RPM) += smd-rpm.o +obj-$(CONFIG_QCOM_SMEM) += smem.o |