diff --git a/[refs] b/[refs]
index 94196ca79eb2..8425b69bac9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa83af7e8f2936732459a2399df87a0b648b454d
+refs/heads/master: 8e12a038f88e819c878e5697ff681cb08bcebb08
diff --git a/trunk/arch/xtensa/include/asm/hardirq.h b/trunk/arch/xtensa/include/asm/hardirq.h
index 26664cef8f11..91695a135498 100644
--- a/trunk/arch/xtensa/include/asm/hardirq.h
+++ b/trunk/arch/xtensa/include/asm/hardirq.h
@@ -11,9 +11,6 @@
 #ifndef _XTENSA_HARDIRQ_H
 #define _XTENSA_HARDIRQ_H
 
-void ack_bad_irq(unsigned int irq);
-#define ack_bad_irq ack_bad_irq
-
 #include <asm-generic/hardirq.h>
 
 #endif	/* _XTENSA_HARDIRQ_H */