From: Al Viro <viro@ftp.linux.org.uk>

move the sanity check for NR_IRQS being no more than 1<<HARDIRQ_BITS from
asm-m68k/hardirq.h to asm-m68k/irq.h; needed since NR_IRQS is not necessary
know at the points of inclusion of asm/hardirq.h due to the rather ugly header
dependencies on m68k.  Fix is by far simpler than trying to massage those
dependencies...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/asm-m68k/hardirq.h |    9 ---------
 include/asm-m68k/irq.h     |    9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff -puN include/asm-m68k/hardirq.h~m68k-compile-fix-hardirq-checks-were-in-wrong-place include/asm-m68k/hardirq.h
--- devel/include/asm-m68k/hardirq.h~m68k-compile-fix-hardirq-checks-were-in-wrong-place	2006-01-04 22:23:42.000000000 -0800
+++ devel-akpm/include/asm-m68k/hardirq.h	2006-01-04 22:23:42.000000000 -0800
@@ -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 -puN include/asm-m68k/irq.h~m68k-compile-fix-hardirq-checks-were-in-wrong-place include/asm-m68k/irq.h
--- devel/include/asm-m68k/irq.h~m68k-compile-fix-hardirq-checks-were-in-wrong-place	2006-01-04 22:23:42.000000000 -0800
+++ devel-akpm/include/asm-m68k/irq.h	2006-01-04 22:23:42.000000000 -0800
@@ -23,6 +23,15 @@
 #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.
  * Adding an interrupt service routine for one of these sources
_