diff options
author | David Daney <david.daney@cavium.com> | 2012-07-05 12:12:37 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2012-07-23 08:54:52 -0400 |
commit | 0b28b823ac5bd4f9b2876ce9432ff2006c529f06 (patch) | |
tree | a57f0244ea78298e93a8fec371f648ac14693912 /arch | |
parent | 6d1ab4c22d43bd2b17cc42513c2fbbde9af93031 (diff) |
MIPS: Octeon: Remove use of OCTEON_IRQ_RST.
This symbol will be removed, so don't use it as part of the definition of
OCTEON_IRQ_LAST.
Set OCTEON_IRQ_LAST to 127 so there is space for all the automatically
allocated (via irq_domain) irqs.
Signed-off-by: David Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3946/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/include/asm/mach-cavium-octeon/irq.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/include/asm/mach-cavium-octeon/irq.h b/arch/mips/include/asm/mach-cavium-octeon/irq.h index 5b05f186e395..81a032490b92 100644 --- a/arch/mips/include/asm/mach-cavium-octeon/irq.h +++ b/arch/mips/include/asm/mach-cavium-octeon/irq.h | |||
@@ -86,6 +86,9 @@ enum octeon_irq { | |||
86 | OCTEON_IRQ_LMC0, | 86 | OCTEON_IRQ_LMC0, |
87 | OCTEON_IRQ_DFM = OCTEON_IRQ_LMC0 + 4, /* Summary of DFM */ | 87 | OCTEON_IRQ_DFM = OCTEON_IRQ_LMC0 + 4, /* Summary of DFM */ |
88 | OCTEON_IRQ_RST, | 88 | OCTEON_IRQ_RST, |
89 | #ifndef CONFIG_PCI_MSI | ||
90 | OCTEON_IRQ_LAST = 127 | ||
91 | #endif | ||
89 | }; | 92 | }; |
90 | 93 | ||
91 | #ifdef CONFIG_PCI_MSI | 94 | #ifdef CONFIG_PCI_MSI |
@@ -94,8 +97,6 @@ enum octeon_irq { | |||
94 | 97 | ||
95 | #define OCTEON_IRQ_MSI_LAST (OCTEON_IRQ_MSI_BIT0 + 255) | 98 | #define OCTEON_IRQ_MSI_LAST (OCTEON_IRQ_MSI_BIT0 + 255) |
96 | #define OCTEON_IRQ_LAST (OCTEON_IRQ_MSI_LAST + 1) | 99 | #define OCTEON_IRQ_LAST (OCTEON_IRQ_MSI_LAST + 1) |
97 | #else | ||
98 | #define OCTEON_IRQ_LAST (OCTEON_IRQ_RST + 1) | ||
99 | #endif | 100 | #endif |
100 | 101 | ||
101 | #endif | 102 | #endif |