Skip to content

Commit

Permalink
MIPS: Octeon: Remove use of OCTEON_IRQ_RST.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David Daney authored and Ralf Baechle committed Jul 23, 2012
1 parent 6d1ab4c commit 0b28b82
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions arch/mips/include/asm/mach-cavium-octeon/irq.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

0 comments on commit 0b28b82

Please sign in to comment.