git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[pandora-kernel.git]
/
include
/
asm-mips
/
bitops.h
diff --git
a/include/asm-mips/bitops.h
b/include/asm-mips/bitops.h
index
098cec2
..
1bb89c5
100644
(file)
--- a/
include/asm-mips/bitops.h
+++ b/
include/asm-mips/bitops.h
@@
-31,7
+31,7
@@
#ifdef __KERNEL__
-#include <
asm/interrupt
.h>
+#include <
linux/irqflags
.h>
#include <asm/sgidefs.h>
#include <asm/war.h>