diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-08-10 14:36:23 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-08-10 14:36:23 +0200 |
commit | fdbdfefbabefcdf3f57560163b43fdc4cf95eb2f (patch) | |
tree | 1d0c420d4eaff48cf2486f10dded8d551241ee94 /drivers/mailbox/Makefile | |
parent | x86/timers/apic: Inform TSC deadline clockevent device about recalibration (diff) | |
parent | Revert "printk: create pr_<level> functions" (diff) | |
download | linux-fdbdfefbabefcdf3f57560163b43fdc4cf95eb2f.tar.xz linux-fdbdfefbabefcdf3f57560163b43fdc4cf95eb2f.zip |
Merge branch 'linus' into timers/urgent, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 0be3e742bb7d..66c38e300dfc 100644 --- a/drivers/mailbox/Makefile +++ b/drivers/mailbox/Makefile @@ -25,3 +25,5 @@ obj-$(CONFIG_TI_MESSAGE_MANAGER) += ti-msgmgr.o obj-$(CONFIG_XGENE_SLIMPRO_MBOX) += mailbox-xgene-slimpro.o obj-$(CONFIG_HI6220_MBOX) += hi6220-mailbox.o + +obj-$(CONFIG_BCM_PDC_MBOX) += bcm-pdc-mailbox.o |