git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'parisc-4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...
[sfrench/cifs-2.6.git]
/
arch
/
arc
/
kernel
/
mcip.c
diff --git
a/arch/arc/kernel/mcip.c
b/arch/arc/kernel/mcip.c
index f39142acc89e032627ef88431ac4775e71949ed2..560c4afc2af4882f7e64191350be90efef808754 100644
(file)
--- a/
arch/arc/kernel/mcip.c
+++ b/
arch/arc/kernel/mcip.c
@@
-11,8
+11,8
@@
#include <linux/smp.h>
#include <linux/irq.h>
#include <linux/spinlock.h>
+#include <soc/arc/mcip.h>
#include <asm/irqflags-arcv2.h>
-#include <asm/mcip.h>
#include <asm/setup.h>
static DEFINE_RAW_SPINLOCK(mcip_lock);