diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-06 17:36:53 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-06 17:36:53 -0700 |
commit | c6594fc6af1924b7fdce600088b10e3b3b159fb7 (patch) | |
tree | 9abf18bf70373623310aa6ea8e671d571e6236c1 /drivers/mailbox/Makefile | |
parent | 553911c67eb701d46e2dcd073f603c6f6546c38b (diff) | |
parent | a649244de727b87d38fe46d86ef98c8d1fc49551 (diff) | |
download | linux-c6594fc6af1924b7fdce600088b10e3b3b159fb7.tar.bz2 |
Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration
Pull mailbox updates from Jussi Brar:
"New driver and DT bindings for MHU controller integrated on Amlogic
Meson platform"
* 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
dt-bindings: mailbox: Add Amlogic Meson MHU Bindings
mailbox: Add Platform Message-Handling-Unit variant driver
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 66c38e300dfc..ace6fed8fea9 100644 --- a/drivers/mailbox/Makefile +++ b/drivers/mailbox/Makefile @@ -6,6 +6,8 @@ obj-$(CONFIG_MAILBOX_TEST) += mailbox-test.o obj-$(CONFIG_ARM_MHU) += arm_mhu.o +obj-$(CONFIG_PLATFORM_MHU) += platform_mhu.o + obj-$(CONFIG_PL320_MBOX) += pl320-ipc.o obj-$(CONFIG_OMAP2PLUS_MBOX) += omap-mailbox.o |