Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-omap-h63xx.git] / include / linux / irq.h

diff --git a/include/linux/irq.h b/include/linux/irq.h
index 31632aa65d16a335e5bc03ad651bc53aeb48a6c9..d058c57be02d3508e27382e63980bfb593658649 100644 (file)
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -11,22 +11,6 @@
 
 #include <linux/smp.h>
 
-#ifndef CONFIG_GENERIC_HARDIRQS
-# define nr_irqs               NR_IRQS
-
-# define for_each_irq_desc(irq, desc)          \
-       for (irq = 0; irq < nr_irqs; irq++)
-#else
-extern int nr_irqs;
-
-# define for_each_irq_desc(irq, desc)          \
-       for (irq = 0, desc = irq_desc; irq < nr_irqs; irq++, desc++)
-
-# define for_each_irq_desc_reverse(irq, desc)                  \
-       for (irq = nr_irqs -1, desc = irq_desc + (nr_irqs -1 ); \
-            irq > 0; irq--, desc--)
-#endif
-
 #ifndef CONFIG_S390
 
 #include <linux/linkage.h>
@@ -34,6 +18,7 @@ extern int nr_irqs;
 #include <linux/spinlock.h>
 #include <linux/cpumask.h>
 #include <linux/irqreturn.h>
+#include <linux/irqnr.h>
 #include <linux/errno.h>
 
 #include <asm/irq.h>