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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
pmcs-msp71xx
/
msp_irq.c
diff --git
a/arch/mips/pmcs-msp71xx/msp_irq.c
b/arch/mips/pmcs-msp71xx/msp_irq.c
index f914c753de21dcc9982a3f13ec007db9069d42a4..8d53d7a2ed45ca87e973a4db00ef8e2d330f96e6 100644
(file)
--- a/
arch/mips/pmcs-msp71xx/msp_irq.c
+++ b/
arch/mips/pmcs-msp71xx/msp_irq.c
@@
-16,6
+16,7
@@
#include <linux/time.h>
#include <asm/irq_cpu.h>
+#include <asm/setup.h>
#include <msp_int.h>