diff --git a/[refs] b/[refs]
index acbeefc8d5fb..18614fd292a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 994e9a2e01f47f7ce24dec7edc45d70401468370
+refs/heads/master: 6843f405da9d0adf734d8f695311e29cc92a220c
diff --git a/trunk/arch/blackfin/include/asm/hardirq.h b/trunk/arch/blackfin/include/asm/hardirq.h
index cbd52f86bb9f..0b78b873df51 100644
--- a/trunk/arch/blackfin/include/asm/hardirq.h
+++ b/trunk/arch/blackfin/include/asm/hardirq.h
@@ -6,6 +6,9 @@
 extern void ack_bad_irq(unsigned int irq);
 #define ack_bad_irq ack_bad_irq
 
+/* Define until common code gets sane defaults */
+#define HARDIRQ_BITS 9
+
 #include <asm-generic/hardirq.h>
 
 #endif