From b38134e02fbfc772b419588fc5fedf095a209cef Mon Sep 17 00:00:00 2001
From: Yoichi Yuasa <yuasa@linux-mips.org>
Date: Wed, 18 Jul 2012 14:12:01 -0700
Subject: [PATCH] --- yaml --- r: 312075 b: refs/heads/master c:
 893a0574de0c90a4e52c8f7070023b2eb58cd220 h: refs/heads/master i:   312073:
 6e590de1e4d5bfd62bd1b32a0128ae17f32d35e0   312071:
 9af2fb712edbeb382c836d3ad346b2057c69659c v: v3

---
 [refs]                               | 2 +-
 trunk/arch/mips/include/asm/bitops.h | 1 -
 trunk/arch/mips/include/asm/io.h     | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fce5b687348d..f44b2fe0c02f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eea03c20ae38a55405c0865ed9adfccc400e4c8e
+refs/heads/master: 893a0574de0c90a4e52c8f7070023b2eb58cd220
diff --git a/trunk/arch/mips/include/asm/bitops.h b/trunk/arch/mips/include/asm/bitops.h
index 2e1ad4c652b7..82ad35ce2b45 100644
--- 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
index a58f22998a86..29d9c23c20c7 100644
--- 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>