Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (117 commits)
  [ARM] 4058/2: iop32x: set ->broken_parity_status on n2100 onboard r8169 ports
  [ARM] 4140/1: AACI stability add ac97 timeout and retries
  [ARM] 4139/1: AACI record support
  [ARM] 4138/1: AACI: multiple channel support for IRQ handling
  [ARM] 4211/1: Provide a defconfig for ns9xxx
  [ARM] 4210/1: base for new machine type "NetSilicon NS9360"
  [ARM] 4222/1: S3C2443: Remove reference to missing S3C2443_PM
  [ARM] 4221/1: S3C2443: DMA support
  [ARM] 4220/1: S3C24XX: DMA system initialised from sysdev
  [ARM] 4219/1: S3C2443: DMA source definitions
  [ARM] 4218/1: S3C2412: fix CONFIG_CPU_S3C2412_ONLY wrt to S3C2443
  [ARM] 4217/1: S3C24XX: remove the dma channel show at startup
  [ARM] 4090/2: avoid clash between PXA and SA1111 defines
  [ARM] 4216/1: add .gitignore entries for ARM specific files
  [ARM] 4214/2: S3C2410: Add Armzone QT2410
  [ARM] 4215/1: s3c2410 usb device:  per-platform vbus_draw
  [ARM] 4213/1: S3C2410 - Update definition of ADCTSC_XY_PST
  [ARM] 4098/1: ARM: rtc_lock only used with rtc_cmos
  [ARM] 4137/1: Add kexec support
  [ARM] 4201/1: SMP barriers pair needed for the secondary boot process
  ...

Fix up conflict due to typedef removal in sound/arm/aaci.h

1 files changed, 16 insertions, 1 deletions

diff --git a/include/asm-arm/arch-realview/irqs.h b/include/asm-arm/arch-realview/irqs.h
index c16223c9588d..5a5db56f86b8 100644
--- a/include/asm-arm/arch-realview/irqs.h
+++ b/include/asm-arm/arch-realview/irqs.h
@@ -65,6 +65,21 @@
 #define IRQ_AACI                (IRQ_GIC_START + INT_AACI)
 #define IRQ_ETH                 (IRQ_GIC_START + INT_ETH)
 #define IRQ_USB                 (IRQ_GIC_START + INT_USB)
+#define IRQ_PMU_CPU0            (IRQ_GIC_START + INT_PMU_CPU0)
+#define IRQ_PMU_CPU1            (IRQ_GIC_START + INT_PMU_CPU1)
+#define IRQ_PMU_CPU2            (IRQ_GIC_START + INT_PMU_CPU2)
+#define IRQ_PMU_CPU3            (IRQ_GIC_START + INT_PMU_CPU3)
+#define IRQ_PMU_SCU0            (IRQ_GIC_START + INT_PMU_SCU0)
+#define IRQ_PMU_SCU1            (IRQ_GIC_START + INT_PMU_SCU1)
+#define IRQ_PMU_SCU2            (IRQ_GIC_START + INT_PMU_SCU2)
+#define IRQ_PMU_SCU3            (IRQ_GIC_START + INT_PMU_SCU3)
+#define IRQ_PMU_SCU4            (IRQ_GIC_START + INT_PMU_SCU4)
+#define IRQ_PMU_SCU5            (IRQ_GIC_START + INT_PMU_SCU5)
+#define IRQ_PMU_SCU6            (IRQ_GIC_START + INT_PMU_SCU6)
+#define IRQ_PMU_SCU7            (IRQ_GIC_START + INT_PMU_SCU7)
+
+#define IRQ_EB_IRQ1             (IRQ_GIC_START + INT_EB_IRQ1)
+#define IRQ_EB_IRQ2             (IRQ_GIC_START + INT_EB_IRQ2)
 
 #define IRQMASK_WDOGINT         INTMASK_WDOGINT
 #define IRQMASK_SOFTINT         INTMASK_SOFTINT
@@ -103,4 +118,4 @@
 #define IRQMASK_ETH             INTMASK_ETH
 #define IRQMASK_USB             INTMASK_USB
 
-#define NR_IRQS                 (IRQ_GIC_START + 64)
+#define NR_IRQS                 (IRQ_GIC_START + 96)