diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-11 12:09:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-11 12:09:37 -0800 |
| commit | 14ba9a2e4bacc6f5a0dbe0de5390daedd544508f (patch) | |
| tree | 90b0d639f577feada25fb56837c3e8350b7de035 /drivers/mailbox/Makefile | |
| parent | Merge tag 'spi-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi (diff) | |
| parent | Mailbox: Add support for Platform Communication Channel (diff) | |
| download | linux-dev-14ba9a2e4bacc6f5a0dbe0de5390daedd544508f.tar.xz linux-dev-14ba9a2e4bacc6f5a0dbe0de5390daedd544508f.zip | |
Merge branch 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu/integration
Pull mailbox framework updates from Jassi Brar.
* 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
Mailbox: Add support for Platform Communication Channel
mailbox/omap: adapt to the new mailbox framework
mailbox: add tx_prepare client callback
mailbox: Don't unnecessarily re-arm the polling timer
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 94ed7cefb14d..dd412c22208b 100644 --- a/drivers/mailbox/Makefile +++ b/drivers/mailbox/Makefile @@ -5,3 +5,5 @@ obj-$(CONFIG_MAILBOX) += mailbox.o obj-$(CONFIG_PL320_MBOX) += pl320-ipc.o obj-$(CONFIG_OMAP2PLUS_MBOX) += omap-mailbox.o + +obj-$(CONFIG_PCC) += pcc.o |