[ARM] Prevent namespace clash with IRq numbering

Add "IRQ_" prefix to these sa1111 irq numbers.

arch/arm/mach-sa1100/sa1111.c

@@ -63,12 +63,12 @@ static struct sa1111_dev usb_dev = {
 	.skpcr_mask	= SKPCR_UCLKEN,
 	.devid		= SA1111_DEVID_USB,
 	.irq = {
-		USBPWR
-		NIRQHCIM,
-		HCIBUFFACC,
-		HCIRMTWKP,
-		NHCIMFCIR,
-		USB_PORT_RESUME
+		IRQ_USBPWR,
+		IRQ_NHCIM,
+		IRQ_HCIBUFFACC,
+		IRQ_HCIRMTWKP,
+		IRQ_NHCIMFCIR,
+		IRQ_USB_PORT_RESUME
 	},
 };
 
@@ -133,12 +133,12 @@ static struct sa1111_dev pcmcia_dev = {
 	.skpcr_mask	= 0,
 	.devid		= SA1111_DEVID_PCMCIA,
 	.irq = {
-		S0_READY_NINT,
-		S0_CD_VALID,
-		S0_BVD1_STSCHG,
-		S1_READY_NINT,
-		S1_CD_VALID,
-		S1_BVD1_STSCHG,
+		IRQ_S0_READY_NINT,
+		IRQ_S0_CD_VALID,
+		IRQ_S0_BVD1_STSCHG,
+		IRQ_S1_READY_NINT,
+		IRQ_S1_CD_VALID,
+		IRQ_S1_BVD1_STSCHG,
 	},
 };
 
@@ -345,8 +345,8 @@ static void __init sa1111_init_irq(struct sa1111_dev *sadev)
 	 * specifies that S0ReadyInt and S1ReadyInt should be '1'.
 	 */
 	sa1111_writel(0, sadev->mapbase + SA1111_INTPOL0);
-	sa1111_writel(SA1111_IRQMASK_HI(S0_READY_NINT) |
-		      SA1111_IRQMASK_HI(S1_READY_NINT),
+	sa1111_writel(SA1111_IRQMASK_HI(IRQ_S0_READY_NINT) |
+		      SA1111_IRQMASK_HI(IRQ_S1_READY_NINT),
 		      sadev->mapbase + SA1111_INTPOL1);
 
 	/* clear all IRQs */
@@ -359,7 +359,7 @@ static void __init sa1111_init_irq(struct sa1111_dev *sadev)
 		set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
 	}
 
-	for (irq = AUDXMTDMADONEA; irq <= S1_BVD1_STSCHG; irq++) {
+	for (irq = AUDXMTDMADONEA; irq <= IRQ_S1_BVD1_STSCHG; irq++) {
 		set_irq_chip(irq, &sa1111_high_chip);
 		set_irq_handler(irq, do_edge_IRQ);
 		set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);

include/asm-arm/arch-sa1100/irqs.h

@@ -108,18 +108,18 @@
 #define AUDDTS			(IRQ_BOARD_END + 40)
 #define AUDRDD			(IRQ_BOARD_END + 41)
 #define AUDSTO			(IRQ_BOARD_END + 42)
-#define USBPWR			(IRQ_BOARD_END + 43)
-#define NIRQHCIM		(IRQ_BOARD_END + 44)
-#define IRQHCIBUFFACC		(IRQ_BOARD_END + 45)
-#define IRQHCIRMTWKP		(IRQ_BOARD_END + 46)
-#define NHCIMFCIR		(IRQ_BOARD_END + 47)
-#define USB_PORT_RESUME		(IRQ_BOARD_END + 48)
-#define S0_READY_NINT		(IRQ_BOARD_END + 49)
-#define S1_READY_NINT		(IRQ_BOARD_END + 50)
-#define S0_CD_VALID		(IRQ_BOARD_END + 51)
-#define S1_CD_VALID		(IRQ_BOARD_END + 52)
-#define S0_BVD1_STSCHG		(IRQ_BOARD_END + 53)
-#define S1_BVD1_STSCHG		(IRQ_BOARD_END + 54)
+#define IRQ_USBPWR		(IRQ_BOARD_END + 43)
+#define IRQ_NHCIM		(IRQ_BOARD_END + 44)
+#define IRQ_HCIBUFFACC		(IRQ_BOARD_END + 45)
+#define IRQ_HCIRMTWKP		(IRQ_BOARD_END + 46)
+#define IRQ_NHCIMFCIR		(IRQ_BOARD_END + 47)
+#define IRQ_USB_PORT_RESUME	(IRQ_BOARD_END + 48)
+#define IRQ_S0_READY_NINT	(IRQ_BOARD_END + 49)
+#define IRQ_S1_READY_NINT	(IRQ_BOARD_END + 50)
+#define IRQ_S0_CD_VALID		(IRQ_BOARD_END + 51)
+#define IRQ_S1_CD_VALID		(IRQ_BOARD_END + 52)
+#define IRQ_S0_BVD1_STSCHG	(IRQ_BOARD_END + 53)
+#define IRQ_S1_BVD1_STSCHG	(IRQ_BOARD_END + 54)
 
 /*
  * Figure out the MAX IRQ number.
@@ -129,7 +129,7 @@
  * Otherwise, we have the standard IRQs only.
  */
 #ifdef CONFIG_SA1111
-#define NR_IRQS			(S1_BVD1_STSCHG + 1)
+#define NR_IRQS			(IRQ_S1_BVD1_STSCHG + 1)
 #elif defined(CONFIG_SA1100_GRAPHICSCLIENT) || \
       defined(CONFIG_SA1100_GRAPHICSMASTER) || \
       defined(CONFIG_SA1100_H3800)