From f3929817eda858c9913db2e8a98adc3b6f65718d Mon Sep 17 00:00:00 2001
From: Yoichi Yuasa <yuasa@linux-mips.org>
Date: Thu, 19 Jul 2012 07:13:54 +0200
Subject: [PATCH] --- yaml --- r: 312143 b: refs/heads/master c:
 3592c3cd061fc717b90126de31912110fe0cae3c h: refs/heads/master i:   312141:
 3ac5b4172941da5339abe3fc147144a6645f811e   312139:
 99be91b5859e82fb95142fa402d66a36929669a6   312135:
 ce88294ca2c50901138b6ec02e90d44f9752f0bd   312127:
 f93ed4b5d175706b5782689d611f023fda3b2627 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 d40a2bd0a225..95cde5812596 100644
--- 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
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>