diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
| commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
| tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /arch/ppc/amiga | |
| parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) | |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'arch/ppc/amiga')
| -rw-r--r-- | arch/ppc/amiga/amiints.c | 3 | ||||
| -rw-r--r-- | arch/ppc/amiga/cia.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/ppc/amiga/amiints.c b/arch/ppc/amiga/amiints.c index 75d90312b..b895e6c02 100644 --- a/arch/ppc/amiga/amiints.c +++ b/arch/ppc/amiga/amiints.c @@ -350,7 +350,8 @@ inline void amiga_do_irq(int irq, struct pt_regs *fp) void amiga_do_irq_list(int irq, struct pt_regs *fp, struct irq_server *server) { irq_node_t *node, *slow_nodes; - unsigned short flags, intena; + unsigned short intena; + unsigned long flags; kstat.irqs[0][SYS_IRQS + irq]++; if (server->count++) diff --git a/arch/ppc/amiga/cia.c b/arch/ppc/amiga/cia.c index 85133f8da..e420415a6 100644 --- a/arch/ppc/amiga/cia.c +++ b/arch/ppc/amiga/cia.c @@ -45,10 +45,10 @@ struct ciabase { do { \ if (irq >= IRQ_AMIGA_CIAB) { \ base = &ciab_base; \ - irq =- IRQ_AMIGA_CIAB; \ + irq -= IRQ_AMIGA_CIAB; \ } else { \ base = &ciaa_base; \ - irq =- IRQ_AMIGA_CIAA; \ + irq -= IRQ_AMIGA_CIAA; \ } \ } while (0) |