From eed2a0717477def0bac2e2b0b6a961f9a3134d52 Mon Sep 17 00:00:00 2001
From: Kristoffer Ericson <Kristoffer.Ericson@gmail.com>
Date: Tue, 11 Sep 2007 12:48:45 +0900
Subject: [PATCH] --- yaml --- r: 68244 b: refs/heads/master c:
 f1382305b9357c8152852d6fcf0d84570d83987a h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/sh/cchips/hd6446x/hd64461.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1687f846153d..e5bae8710e04 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb650d67d8ad0fa16c0c61674d980adb25155358
+refs/heads/master: f1382305b9357c8152852d6fcf0d84570d83987a
diff --git a/trunk/arch/sh/cchips/hd6446x/hd64461.c b/trunk/arch/sh/cchips/hd6446x/hd64461.c
index 97f6512aa1b7..b77754d9697a 100644
--- a/trunk/arch/sh/cchips/hd6446x/hd64461.c
+++ b/trunk/arch/sh/cchips/hd6446x/hd64461.c
@@ -14,6 +14,9 @@
 #include <asm/irq.h>
 #include <asm/hd64461.h>
 
+/* This belongs in cpu specific */
+#define INTC_ICR1 0xA4140010UL
+
 static void disable_hd64461_irq(unsigned int irq)
 {
 	unsigned short nimr;
@@ -121,7 +124,7 @@ int hd64461_irq_demux(int irq)
 			}
 		}
 	}
-	return __irq_demux(irq);
+	return irq;
 }
 
 static struct irqaction irq0 = { hd64461_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "HD64461", NULL, NULL };
@@ -143,6 +146,7 @@ int __init setup_hd64461(void)
 #endif
 	outw(0xffff, HD64461_NIMR);
 
+	/*  IRQ 80 -> 95 belongs to HD64461  */
 	for (i = HD64461_IRQBASE; i < HD64461_IRQBASE + 16; i++) {
 		irq_desc[i].chip = &hd64461_irq_type;
 	}