diff options
| author | Jon Medhurst <tixy@linaro.org> | 2014-09-30 10:04:39 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2014-09-30 10:04:39 +0100 |
| commit | 8e77187d3114f97095c107c718a6be31915ef9ae (patch) | |
| tree | fadaf9672047ca160a2f0efb3bab1c3a362665e7 /drivers/mailbox/pl320-ipc.c | |
| parent | 1b88bde8f19ff637bafbb8768f73a72f68289be0 (diff) | |
| parent | 65ce6743030668fba9b4965c21056997944c7b23 (diff) | |
Merge branch 'tracking-armlt-juno-cpufreq' into integration-linaro-vexpresstracking-integration-linaro-vexpress-ll-20141007.0tracking-integration-linaro-vexpress-ll-20140930.0
Diffstat (limited to 'drivers/mailbox/pl320-ipc.c')
| -rw-r--r-- | drivers/mailbox/pl320-ipc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mailbox/pl320-ipc.c b/drivers/mailbox/pl320-ipc.c index d873cbae2fbb..f3755e0aa935 100644 --- a/drivers/mailbox/pl320-ipc.c +++ b/drivers/mailbox/pl320-ipc.c @@ -26,7 +26,7 @@ #include <linux/device.h> #include <linux/amba/bus.h> -#include <linux/mailbox.h> +#include <linux/pl320-ipc.h> #define IPCMxSOURCE(m) ((m) * 0x40) #define IPCMxDSET(m) (((m) * 0x40) + 0x004) |