From 137abaa9f53751b246795270e47742b5c59d2af2 Mon Sep 17 00:00:00 2001
From: Mike Rapoport <mike@compulab.co.il>
Date: Mon, 21 Apr 2008 10:56:32 +0100
Subject: [PATCH] --- yaml --- r: 94959 b: refs/heads/master c:
 406b1ea441cb86671c5b57d2ce722d217914d524 h: refs/heads/master i:   94957:
 b14d081a713ba9cb427ae35f8c486af36e5b45c2   94955:
 ba59dfb521bf083ee39930149afb1e01de7ec9e3   94951:
 923e69d0cf461298a56db56fb01a402748da51ff   94943:
 cc98afc9f4448e4e2b8df10a41c62ac235e535b7 v: v3

---
 [refs]                                | 2 +-
 trunk/include/asm-arm/arch-pxa/irqs.h | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index dfdb556e3bed..8fe262cf56cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5826042d3c550522e49a8a55db64d9c47b43a8f9
+refs/heads/master: 406b1ea441cb86671c5b57d2ce722d217914d524
diff --git a/trunk/include/asm-arm/arch-pxa/irqs.h b/trunk/include/asm-arm/arch-pxa/irqs.h
index 50c77eacbd5e..b6c8fe377683 100644
--- a/trunk/include/asm-arm/arch-pxa/irqs.h
+++ b/trunk/include/asm-arm/arch-pxa/irqs.h
@@ -239,7 +239,7 @@
 /* ITE8152 irqs */
 /* add IT8152 IRQs beyond BOARD_END */
 #ifdef CONFIG_PCI_HOST_ITE8152
-#define IT8152_IRQ(x)   (IRQ_GPIO(IRQ_BOARD_END) + 1 + (x))
+#define IT8152_IRQ(x)   (IRQ_BOARD_END + (x))
 
 /* IRQ-sources in 3 groups - local devices, LPC (serial), and external PCI */
 #define IT8152_LD_IRQ_COUNT     9
@@ -253,6 +253,9 @@
 
 #define IT8152_LAST_IRQ         IT8152_LD_IRQ(IT8152_LD_IRQ_COUNT - 1)
 
+#if NR_IRQS < (IT8152_LAST_IRQ+1)
 #undef NR_IRQS
 #define NR_IRQS (IT8152_LAST_IRQ+1)
 #endif
+
+#endif /* CONFIG_PCI_HOST_ITE8152 */