Merge branch 'v2.6.35-omap-mailbox-for-next' of git://gitorious.org/~doyu/lk/mainline...

[mv-sheeva.git] / arch / arm / mach-kirkwood / include / mach / irqs.h

diff --git a/arch/arm/mach-kirkwood/include/mach/irqs.h b/arch/arm/mach-kirkwood/include/mach/irqs.h
index ffab89f21c11da5aa31d9bbf7abacc9243565072..9da2eb59180b2128af2d14bed71091d2bd574b1d 100644 (file)
--- a/arch/arm/mach-kirkwood/include/mach/irqs.h
+++ b/arch/arm/mach-kirkwood/include/mach/irqs.h
@@ -11,8 +11,6 @@
 #ifndef __ASM_ARCH_IRQS_H
 #define __ASM_ARCH_IRQS_H
 
-#include "kirkwood.h"  /* need GPIO_MAX */
-
 /*
  * Low Interrupt Controller
  */
@@ -25,6 +23,7 @@
 #define IRQ_KIRKWOOD_XOR_10    7
 #define IRQ_KIRKWOOD_XOR_11    8
 #define IRQ_KIRKWOOD_PCIE      9
+#define IRQ_KIRKWOOD_PCIE1     10
 #define IRQ_KIRKWOOD_GE00_SUM  11
 #define IRQ_KIRKWOOD_GE01_SUM  15
 #define IRQ_KIRKWOOD_USB       19
@@ -51,12 +50,13 @@
 #define IRQ_KIRKWOOD_GPIO_HIGH_8_15    40
 #define IRQ_KIRKWOOD_GPIO_HIGH_16_23   41
 #define IRQ_KIRKWOOD_GE00_ERR  46
+#define IRQ_KIRKWOOD_GE01_ERR  47
 
 /*
  * KIRKWOOD General Purpose Pins
  */
 #define IRQ_KIRKWOOD_GPIO_START        64
-#define NR_GPIO_IRQS           GPIO_MAX
+#define NR_GPIO_IRQS           50
 
 #define NR_IRQS                        (IRQ_KIRKWOOD_GPIO_START + NR_GPIO_IRQS)