diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-07 10:24:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-07 10:24:07 -0700 |
| commit | 21c19bc7ee256094aba74af8d91a824da4bc36af (patch) | |
| tree | 85c058588fc097fe6fd0f00caa200c7bd5ed658e /drivers/mailbox/Makefile | |
| parent | b6ffe9ba46016f8351896ccee33bebcd0e5ea7c0 (diff) | |
| parent | 25bfee16d5a3158086273cc51110c7470144c842 (diff) | |
Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration
Pull mailbox updates from Jassi Brar:
- Minor improvement : avoid requiring unnecessary startup/shutdown
callback that many drivers seem to not need
- New controller driver for Qualcomm's APCS IPC
* 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
mailbox: Introduce Qualcomm APCS IPC driver
dt-bindings: mailbox: Introduce Qualcomm APCS global binding
mailbox: Make startup and shutdown ops optional
Diffstat (limited to 'drivers/mailbox/Makefile')
| -rw-r--r-- | drivers/mailbox/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mailbox/Makefile b/drivers/mailbox/Makefile index e2bcb03cd35b..d54e41206e17 100644 --- a/drivers/mailbox/Makefile +++ b/drivers/mailbox/Makefile @@ -32,4 +32,6 @@ obj-$(CONFIG_BCM_PDC_MBOX) += bcm-pdc-mailbox.o obj-$(CONFIG_BCM_FLEXRM_MBOX) += bcm-flexrm-mailbox.o +obj-$(CONFIG_QCOM_APCS_IPC) += qcom-apcs-ipc-mailbox.o + obj-$(CONFIG_TEGRA_HSP_MBOX) += tegra-hsp.o |