From 428f4bc26793a72618e265904a844adce0794d36 Mon Sep 17 00:00:00 2001
From: Martin Michlmayr <tbm@cyrius.com>
Date: Mon, 24 Jul 2006 21:30:01 +0100
Subject: [PATCH] --- yaml --- r: 32900 b: refs/heads/master c:
 d8ca3d11c6611685ea7783b4acb623bf08496f94 h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/include/asm-arm/arch-iop3xx/iop331-irqs.h | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 6c22a61cde66..28cb66a6b31c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 284c5e6e938f79906f2ccc8c4039863e6c739aaa
+refs/heads/master: d8ca3d11c6611685ea7783b4acb623bf08496f94
diff --git a/trunk/include/asm-arm/arch-iop3xx/iop331-irqs.h b/trunk/include/asm-arm/arch-iop3xx/iop331-irqs.h
index 8ff73d487222..7135ad7e335e 100644
--- a/trunk/include/asm-arm/arch-iop3xx/iop331-irqs.h
+++ b/trunk/include/asm-arm/arch-iop3xx/iop331-irqs.h
@@ -91,7 +91,6 @@
 #define NR_IRQS			NR_IOP331_IRQS
 
 
-#if defined(CONFIG_ARCH_IQ80331)
 /*
  * Interrupts available on the IQ80331 board
  */
@@ -111,7 +110,6 @@
 #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
  */
@@ -131,6 +129,4 @@
 #define	IRQ_IQ80332_INTC	IRQ_IOP331_XINT2
 #define	IRQ_IQ80332_INTD	IRQ_IOP331_XINT3
 
-#endif
-
 #endif // _IOP331_IRQ_H_