diff --git a/[refs] b/[refs]
index b8cdc156018e..60e1c3c8a821 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d1ab4c22d43bd2b17cc42513c2fbbde9af93031
+refs/heads/master: 0b28b823ac5bd4f9b2876ce9432ff2006c529f06
diff --git a/trunk/arch/mips/include/asm/mach-cavium-octeon/irq.h b/trunk/arch/mips/include/asm/mach-cavium-octeon/irq.h
index 5b05f186e395..81a032490b92 100644
--- a/trunk/arch/mips/include/asm/mach-cavium-octeon/irq.h
+++ b/trunk/arch/mips/include/asm/mach-cavium-octeon/irq.h
@@ -86,6 +86,9 @@ enum octeon_irq {
 	OCTEON_IRQ_LMC0,
 	OCTEON_IRQ_DFM = OCTEON_IRQ_LMC0 + 4,		/* Summary of DFM */
 	OCTEON_IRQ_RST,
+#ifndef CONFIG_PCI_MSI
+	OCTEON_IRQ_LAST = 127
+#endif
 };
 
 #ifdef CONFIG_PCI_MSI
@@ -94,8 +97,6 @@ enum octeon_irq {
 
 #define OCTEON_IRQ_MSI_LAST      (OCTEON_IRQ_MSI_BIT0 + 255)
 #define OCTEON_IRQ_LAST          (OCTEON_IRQ_MSI_LAST + 1)
-#else
-#define OCTEON_IRQ_LAST         (OCTEON_IRQ_RST + 1)
 #endif
 
 #endif