From fce5ff972aae9f415b1027faec9eeda7efeb3f38 Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Wed, 18 Apr 2012 16:20:38 -0400
Subject: [PATCH] --- yaml --- r: 299705 b: refs/heads/master c:
 bfae8ee8d28e6a4ac1d63e8077cb09928d8a557a h: refs/heads/master i:   299703:
 4e71389bb6675956d3714f242fd9359792dad609 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/xtensa/include/asm/io.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e364061d01eb..341349b48ee1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9112a6b2fa4201c284c62a389710bd32b48c5f63
+refs/heads/master: bfae8ee8d28e6a4ac1d63e8077cb09928d8a557a
diff --git a/trunk/arch/xtensa/include/asm/io.h b/trunk/arch/xtensa/include/asm/io.h
index d04cd3a625fa..4beb43c087d3 100644
--- a/trunk/arch/xtensa/include/asm/io.h
+++ b/trunk/arch/xtensa/include/asm/io.h
@@ -14,6 +14,7 @@
 #ifdef __KERNEL__
 #include <asm/byteorder.h>
 #include <asm/page.h>
+#include <linux/bug.h>
 #include <linux/kernel.h>
 
 #include <linux/types.h>