diff options
| author | Kristoffer Ericson <Kristoffer.Ericson@gmail.com> | 2007-09-11 05:48:45 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2007-09-21 04:57:53 +0200 |
| commit | f1382305b9357c8152852d6fcf0d84570d83987a (patch) | |
| tree | 301757c825ed4385b4e6362207a939b8701adbd6 /arch/sh/cchips | |
| parent | backlight: Fix up hp680_bl build. (diff) | |
| download | linux-f1382305b9357c8152852d6fcf0d84570d83987a.tar.xz linux-f1382305b9357c8152852d6fcf0d84570d83987a.zip | |
sh: hd64461: Trivial build fixes for SH7709.
Some trivial fixes to get SH7709 + HD64461 building again.
Signed-off-by: Kristoffer Ericson <Kristoffer.Ericson@gmail.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/cchips')
| -rw-r--r-- | 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 97f6512aa1b7..b77754d9697a 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; } |