---

yaml --- r: 312143 b: refs/heads/master c: 3592c3c h: refs/heads/master i: 312141: 3ac5b41 312139: 99be91b 312135: ce88294 312127: f93ed4b v: v3
git-mirror · Jul 19, 2012 · f392981 · f392981
1 parent d700414
commit f392981
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2b88d65aa7adaa3996088e86ae497fe705e96f3
+refs/heads/master: 3592c3cd061fc717b90126de31912110fe0cae3c
diff --git a/trunk/arch/mips/include/asm/bitops.h b/trunk/arch/mips/include/asm/bitops.h
@@ -17,7 +17,6 @@
 #include <linux/irqflags.h>
 #include <linux/types.h>
 #include <asm/barrier.h>
-#include <asm/bug.h>
 #include <asm/byteorder.h>		/* sigh ... */
 #include <asm/cpu-features.h>
 #include <asm/sgidefs.h>

diff --git a/trunk/arch/mips/include/asm/io.h b/trunk/arch/mips/include/asm/io.h
@@ -17,6 +17,7 @@
 #include <linux/types.h>
 
 #include <asm/addrspace.h>
+#include <asm/bug.h>
 #include <asm/byteorder.h>
 #include <asm/cpu.h>
 #include <asm/cpu-features.h>