diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-21 11:21:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-21 11:21:19 -0700 |
| commit | 43d451f163c1b615c1bedef95258c49712679eeb (patch) | |
| tree | 52ed78b04435ffbd663a902bbd5bdb69a65ad584 /arch/arm | |
| parent | 21d2271fd0812ebe3716cab0b48356837485a74d (diff) | |
| parent | 9f3e3cacb2ffdefe28c7cf490bf543e4dcb2770a (diff) | |
| download | linux-43d451f163c1b615c1bedef95258c49712679eeb.tar.bz2 | |
Merge branch 'mailbox-for-linus' of git://git.linaro.org/landing-teams/working/fujitsu/integration
Pull mailbox framework from Jassi Brar:
"A framework for Mailbox controllers and clients have been cooking for
more than a year now.
Everybody in the CC list had been copied on patchset revisions and
most of them have made sounds of approval, though just one concrete
Reviewed-by. The patchset has also been in linux-next for a couple of
weeks now and no conflict has been reported. The framework has the
backing of at least 5 platforms, though I can't say if/when they
upstream their drivers (some businesses have 'changed')"
(Further acked-by by Arnd Bergmann and Suman Anna in the pull request
thread)
* 'mailbox-for-linus' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
dt: mailbox: add generic bindings
doc: add documentation for mailbox framework
mailbox: Introduce framework for mailbox
mailbox: rename pl320-ipc specific mailbox.h
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-highbank/highbank.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index 8c35ae4ff176..07a09570175d 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c @@ -20,7 +20,7 @@ #include <linux/input.h> #include <linux/io.h> #include <linux/irqchip.h> -#include <linux/mailbox.h> +#include <linux/pl320-ipc.h> #include <linux/of.h> #include <linux/of_irq.h> #include <linux/of_platform.h> |