diff --git a/[refs] b/[refs]
index 3a70cc00c25d..2b949ba8aded 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5a61d0c13db3522a996075bc1b1884a8af2ed37
+refs/heads/master: 85b07cd1aa50aca8331e5dfe3b2ccb2eb391b183
diff --git a/trunk/include/asm-m68k/hardirq.h b/trunk/include/asm-m68k/hardirq.h
index 728318bf7f0e..5e1c5826c83d 100644
--- a/trunk/include/asm-m68k/hardirq.h
+++ b/trunk/include/asm-m68k/hardirq.h
@@ -14,13 +14,4 @@ typedef struct {
 
 #define HARDIRQ_BITS	8
 
-/*
- * The hardirq mask has to be large enough to have
- * space for potentially all IRQ sources in the system
- * nesting on a single CPU:
- */
-#if (1 << HARDIRQ_BITS) < NR_IRQS
-# error HARDIRQ_BITS is too low!
-#endif
-
 #endif
diff --git a/trunk/include/asm-m68k/irq.h b/trunk/include/asm-m68k/irq.h
index 127ad190cf2d..325c86f8512d 100644
--- a/trunk/include/asm-m68k/irq.h
+++ b/trunk/include/asm-m68k/irq.h
@@ -22,6 +22,15 @@
 #define NR_IRQS (24+SYS_IRQS)
 #endif
 
+/*
+ * The hardirq mask has to be large enough to have
+ * space for potentially all IRQ sources in the system
+ * nesting on a single CPU:
+ */
+#if (1 << HARDIRQ_BITS) < NR_IRQS
+# error HARDIRQ_BITS is too low!
+#endif
+
 /*
  * Interrupt source definitions
  * General interrupt sources are the level 1-7.