projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'cgroup-rmdir-updates' into cgroup/for-3.8
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-omap2
/
mailbox.c
diff --git
a/arch/arm/mach-omap2/mailbox.c
b/arch/arm/mach-omap2/mailbox.c
index 6875be837d9f9632cb3ffbd0c3fcbd64b5dcfddc..0d974565f8ca7ec6fae5d6f1fe081c398e2b243b 100644
(file)
--- a/
arch/arm/mach-omap2/mailbox.c
+++ b/
arch/arm/mach-omap2/mailbox.c
@@
-16,8
+16,10
@@
#include <linux/platform_device.h>
#include <linux/io.h>
#include <linux/pm_runtime.h>
+
#include <plat/mailbox.h>
-#include <mach/irqs.h>
+
+#include "soc.h"
#define MAILBOX_REVISION 0x000
#define MAILBOX_MESSAGE(m) (0x040 + 4 * (m))