Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[powerpc.git] / include / asm-arm / arch-realview / irqs.h

diff --git a/include/asm-arm/arch-realview/irqs.h b/include/asm-arm/arch-realview/irqs.h
index c16223c..5a5db56 100644 (file)
--- a/include/asm-arm/arch-realview/irqs.h
+++ b/include/asm-arm/arch-realview/irqs.h
@@ -65,6 +65,21 @@
 #define IRQ_AACI               (IRQ_GIC_START + INT_AACI)
 #define IRQ_ETH                        (IRQ_GIC_START + INT_ETH)
 #define IRQ_USB                        (IRQ_GIC_START + INT_USB)
+#define IRQ_PMU_CPU0           (IRQ_GIC_START + INT_PMU_CPU0)
+#define IRQ_PMU_CPU1           (IRQ_GIC_START + INT_PMU_CPU1)
+#define IRQ_PMU_CPU2           (IRQ_GIC_START + INT_PMU_CPU2)
+#define IRQ_PMU_CPU3           (IRQ_GIC_START + INT_PMU_CPU3)
+#define IRQ_PMU_SCU0           (IRQ_GIC_START + INT_PMU_SCU0)
+#define IRQ_PMU_SCU1           (IRQ_GIC_START + INT_PMU_SCU1)
+#define IRQ_PMU_SCU2           (IRQ_GIC_START + INT_PMU_SCU2)
+#define IRQ_PMU_SCU3           (IRQ_GIC_START + INT_PMU_SCU3)
+#define IRQ_PMU_SCU4           (IRQ_GIC_START + INT_PMU_SCU4)
+#define IRQ_PMU_SCU5           (IRQ_GIC_START + INT_PMU_SCU5)
+#define IRQ_PMU_SCU6           (IRQ_GIC_START + INT_PMU_SCU6)
+#define IRQ_PMU_SCU7           (IRQ_GIC_START + INT_PMU_SCU7)
+
+#define IRQ_EB_IRQ1            (IRQ_GIC_START + INT_EB_IRQ1)
+#define IRQ_EB_IRQ2            (IRQ_GIC_START + INT_EB_IRQ2)
 
 #define IRQMASK_WDOGINT                INTMASK_WDOGINT
 #define IRQMASK_SOFTINT                INTMASK_SOFTINT
@@ -103,4 +118,4 @@
 #define IRQMASK_ETH            INTMASK_ETH
 #define IRQMASK_USB            INTMASK_USB
 
-#define NR_IRQS                        (IRQ_GIC_START + 64)
+#define NR_IRQS                        (IRQ_GIC_START + 96)