git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
m68k
/
amiga
/
cia.c
diff --git
a/arch/m68k/amiga/cia.c
b/arch/m68k/amiga/cia.c
index
7d55682
..
9476eb9
100644
(file)
--- a/
arch/m68k/amiga/cia.c
+++ b/
arch/m68k/amiga/cia.c
@@
-60,7
+60,7
@@
unsigned char cia_set_irq(struct ciabase *base, unsigned char mask)
else
base->icr_data &= ~mask;
if (base->icr_data & base->icr_mask)
else
base->icr_data &= ~mask;
if (base->icr_data & base->icr_mask)
- custom.intreq = IF_SETCLR | base->int_mask;
+
amiga_
custom.intreq = IF_SETCLR | base->int_mask;
return old & base->icr_mask;
}
return old & base->icr_mask;
}
@@
-89,7
+89,7
@@
unsigned char cia_able_irq(struct ciabase *base, unsigned char mask)
}
}
if (base->icr_data & base->icr_mask)
}
}
if (base->icr_data & base->icr_mask)
- custom.intreq = IF_SETCLR | base->int_mask;
+
amiga_
custom.intreq = IF_SETCLR | base->int_mask;
return old;
}
return old;
}
@@
-133,7
+133,7
@@
static irqreturn_t cia_handler(int irq, void *dev_id, struct pt_regs *fp)
mach_irq = base->cia_irq;
irq = SYS_IRQS + mach_irq;
ints = cia_set_irq(base, CIA_ICR_ALL);
mach_irq = base->cia_irq;
irq = SYS_IRQS + mach_irq;
ints = cia_set_irq(base, CIA_ICR_ALL);
- custom.intreq = base->int_mask;
+
amiga_
custom.intreq = base->int_mask;
for (i = 0; i < CIA_IRQS; i++, irq++, mach_irq++) {
if (ints & 1) {
kstat_cpu(0).irqs[irq]++;
for (i = 0; i < CIA_IRQS; i++, irq++, mach_irq++) {
if (ints & 1) {
kstat_cpu(0).irqs[irq]++;
@@
-162,7
+162,7
@@
void __init cia_init_IRQ(struct ciabase *base)
/* install CIA handler */
request_irq(base->handler_irq, cia_handler, 0, base->name, base);
/* install CIA handler */
request_irq(base->handler_irq, cia_handler, 0, base->name, base);
- custom.intena = IF_SETCLR | base->int_mask;
+
amiga_
custom.intena = IF_SETCLR | base->int_mask;
}
int cia_get_irq_list(struct ciabase *base, struct seq_file *p)
}
int cia_get_irq_list(struct ciabase *base, struct seq_file *p)