mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
[ARM] 3731/1: Allow IRQ definitions of IQ80331 and IQ80332 to co-exist
Patch from Martin Michlmayr ARCH_IQ80331 and MACH_IQ80332 can be enabled at the same time but a header file makes certain IRQ definitions conditional, leading to the following compilation error when both platforms are enabled: arch/arm/mach-iop3xx/iq80332-pci.c: In function 'iq80332_map_irq': arch/arm/mach-iop3xx/iq80332-pci.c:54: error: 'IRQ_IQ80332_INTA' undeclared (first use in this function) arch/arm/mach-iop3xx/iq80332-pci.c:54: error: (Each undeclared identifier is reported only once arch/arm/mach-iop3xx/iq80332-pci.c:54: error: for each function it appears in.) arch/arm/mach-iop3xx/iq80332-pci.c:54: error: 'IRQ_IQ80332_INTB' undeclared (first use in this function) arch/arm/mach-iop3xx/iq80332-pci.c:54: error: 'IRQ_IQ80332_INTC' undeclared (first use in this function) arch/arm/mach-iop3xx/iq80332-pci.c:54: error: 'IRQ_IQ80332_INTD' undeclared (first use in this function) Signed-off-by: Martin Michlmayr <tbm@cyrius.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
parent
284c5e6e93
commit
d8ca3d11c6
1 changed files with 0 additions and 4 deletions
|
@ -91,7 +91,6 @@
|
||||||
#define NR_IRQS NR_IOP331_IRQS
|
#define NR_IRQS NR_IOP331_IRQS
|
||||||
|
|
||||||
|
|
||||||
#if defined(CONFIG_ARCH_IQ80331)
|
|
||||||
/*
|
/*
|
||||||
* Interrupts available on the IQ80331 board
|
* Interrupts available on the IQ80331 board
|
||||||
*/
|
*/
|
||||||
|
@ -111,7 +110,6 @@
|
||||||
#define IRQ_IQ80331_INTC IRQ_IOP331_XINT2
|
#define IRQ_IQ80331_INTC IRQ_IOP331_XINT2
|
||||||
#define IRQ_IQ80331_INTD IRQ_IOP331_XINT3
|
#define IRQ_IQ80331_INTD IRQ_IOP331_XINT3
|
||||||
|
|
||||||
#elif defined(CONFIG_MACH_IQ80332)
|
|
||||||
/*
|
/*
|
||||||
* Interrupts available on the IQ80332 board
|
* Interrupts available on the IQ80332 board
|
||||||
*/
|
*/
|
||||||
|
@ -131,6 +129,4 @@
|
||||||
#define IRQ_IQ80332_INTC IRQ_IOP331_XINT2
|
#define IRQ_IQ80332_INTC IRQ_IOP331_XINT2
|
||||||
#define IRQ_IQ80332_INTD IRQ_IOP331_XINT3
|
#define IRQ_IQ80332_INTD IRQ_IOP331_XINT3
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif // _IOP331_IRQ_H_
|
#endif // _IOP331_IRQ_H_
|
||||||
|
|
Loading…
Reference in a new issue