Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f1382305b9357c8152852d6fcf0d84570d83987a
Commit:     f1382305b9357c8152852d6fcf0d84570d83987a
Parent:     eb650d67d8ad0fa16c0c61674d980adb25155358
Author:     Kristoffer Ericson <[EMAIL PROTECTED]>
AuthorDate: Tue Sep 11 12:48:45 2007 +0900
Committer:  Paul Mundt <[EMAIL PROTECTED]>
CommitDate: Fri Sep 21 11:57:53 2007 +0900

    sh: hd64461: Trivial build fixes for SH7709.
    
    Some trivial fixes to get SH7709 + HD64461 building again.
    
    Signed-off-by: Kristoffer Ericson <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mundt <[EMAIL PROTECTED]>
---
 arch/sh/cchips/hd6446x/hd64461.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/arch/sh/cchips/hd6446x/hd64461.c b/arch/sh/cchips/hd6446x/hd64461.c
index 97f6512..b77754d 100644
--- a/arch/sh/cchips/hd6446x/hd64461.c
+++ b/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;
        }
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to