From 3263fbe44a4d173e5e088d9403b5397b9fe61a4a Mon Sep 17 00:00:00 2001
From: John Crispin <blogic@openwrt.org>
Date: Mon, 18 Jul 2011 18:08:40 +0200
Subject: [PATCH] --- yaml --- r: 264303 b: refs/heads/master c:
 77fbdb30f045084f1c65b72bd457d7406343aad7 h: refs/heads/master i:   264301:
 687ab2843de3d55391f06d3f87510d757fa39a7e   264299:
 363f91c970d3c48409c8e1ace25f73ca3ac2f3f8   264295:
 eef49565f0694e8e657a5c12a6d772fcf59862d4   264287:
 573274c911bde7bc18db286ae76ecabbf6cf4022 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/mips/lantiq/irq.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 97725a72ff61..3f2b6e059785 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d954ffe34a606d4ec34cd3c2b0b5974779759f25
+refs/heads/master: 77fbdb30f045084f1c65b72bd457d7406343aad7
diff --git a/trunk/arch/mips/lantiq/irq.c b/trunk/arch/mips/lantiq/irq.c
index fc89795cafdb..f9737bb3c5ab 100644
--- a/trunk/arch/mips/lantiq/irq.c
+++ b/trunk/arch/mips/lantiq/irq.c
@@ -123,11 +123,10 @@ void ltq_enable_irq(struct irq_data *d)
 static unsigned int ltq_startup_eiu_irq(struct irq_data *d)
 {
 	int i;
-	int irq_nr = d->irq - INT_NUM_IRQ0;
 
 	ltq_enable_irq(d);
 	for (i = 0; i < MAX_EIU; i++) {
-		if (irq_nr == ltq_eiu_irq[i]) {
+		if (d->irq == ltq_eiu_irq[i]) {
 			/* low level - we should really handle set_type */
 			ltq_eiu_w32(ltq_eiu_r32(LTQ_EIU_EXIN_C) |
 				(0x6 << (i * 4)), LTQ_EIU_EXIN_C);
@@ -147,11 +146,10 @@ static unsigned int ltq_startup_eiu_irq(struct irq_data *d)
 static void ltq_shutdown_eiu_irq(struct irq_data *d)
 {
 	int i;
-	int irq_nr = d->irq - INT_NUM_IRQ0;
 
 	ltq_disable_irq(d);
 	for (i = 0; i < MAX_EIU; i++) {
-		if (irq_nr == ltq_eiu_irq[i]) {
+		if (d->irq == ltq_eiu_irq[i]) {
 			/* disable */
 			ltq_eiu_w32(ltq_eiu_r32(LTQ_EIU_EXIN_INEN) & ~(1 << i),
 				LTQ_EIU_EXIN_INEN);