Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

[cascardo/linux.git] / arch / arm / mach-u300 / include / mach / irqs.h

diff --git a/arch/arm/mach-u300/include/mach/irqs.h b/arch/arm/mach-u300/include/mach/irqs.h
index a6867b1..09b1b28 100644 (file)
--- a/arch/arm/mach-u300/include/mach/irqs.h
+++ b/arch/arm/mach-u300/include/mach/irqs.h
@@ -109,6 +109,13 @@
 #define U300_NR_IRQS                   48
 #endif
 
+#ifdef CONFIG_AB3550_CORE
+#define IRQ_AB3550_BASE                        (U300_NR_IRQS)
+#define IRQ_AB3550_END                 (IRQ_AB3550_BASE + 37)
+
+#define NR_IRQS                                (IRQ_AB3550_END + 1)
+#else
 #define NR_IRQS U300_NR_IRQS
+#endif
 
 #endif