git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
asm-arm
/
arch-iop3xx
/
iop331-irqs.h
diff --git
a/include/asm-arm/arch-iop3xx/iop331-irqs.h
b/include/asm-arm/arch-iop3xx/iop331-irqs.h
index
8ff73d4
..
7135ad7
100644
(file)
--- a/
include/asm-arm/arch-iop3xx/iop331-irqs.h
+++ b/
include/asm-arm/arch-iop3xx/iop331-irqs.h
@@
-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_INTD IRQ_IOP331_XINT3
#define IRQ_IQ80331_INTC IRQ_IOP331_XINT2
#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_INTD IRQ_IOP331_XINT3
#define IRQ_IQ80332_INTC IRQ_IOP331_XINT2
#define IRQ_IQ80332_INTD IRQ_IOP331_XINT3
-#endif
-
#endif // _IOP331_IRQ_H_
#endif // _IOP331_IRQ_H_