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

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-iop13xx / irqs.h

diff --git a/include/asm-arm/arch-iop13xx/irqs.h b/include/asm-arm/arch-iop13xx/irqs.h
index 5c6fac2a400497118bc2209effb0698a4b5cea27..054e7acb5bfa36264c64eecaf950c4480c769fe0 100644 (file)
--- a/include/asm-arm/arch-iop13xx/irqs.h
+++ b/include/asm-arm/arch-iop13xx/irqs.h
@@ -168,7 +168,7 @@ static inline u32 read_intpnd_3(void)
 #define IRQ_IOP13XX_ATUE_IMD   (110) /* 14 */
 #define IRQ_IOP13XX_MU_MSI_TB  (111) /* 15 */
 #define IRQ_IOP13XX_RSVD_112   (112) /* 16 */
-#define IRQ_IOP13XX_RSVD_113   (113) /* 17 */
+#define IRQ_IOP13XX_INBD_MSI   (113) /* 17 */
 #define IRQ_IOP13XX_RSVD_114   (114) /* 18 */
 #define IRQ_IOP13XX_RSVD_115   (115) /* 19 */
 #define IRQ_IOP13XX_RSVD_116   (116) /* 20 */
@@ -184,7 +184,13 @@ static inline u32 read_intpnd_3(void)
 #define IRQ_IOP13XX_RSVD_126   (126) /* 30 */
 #define IRQ_IOP13XX_HPI        (127) /* 31 */
 
+#ifdef CONFIG_PCI_MSI
+#define IRQ_IOP13XX_MSI_0      (IRQ_IOP13XX_HPI + 1)
+#define NR_IOP13XX_IRQS        (IRQ_IOP13XX_MSI_0 + 128)
+#else
 #define NR_IOP13XX_IRQS        (IRQ_IOP13XX_HPI + 1)
+#endif
+
 #define NR_IRQS                NR_IOP13XX_IRQS
 
 #endif /* _IOP13XX_IRQ_H_ */