aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/amiga/cia.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/m68k/amiga/cia.c')
-rw-r--r--arch/m68k/amiga/cia.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/m68k/amiga/cia.c b/arch/m68k/amiga/cia.c
index 7d55682615e3..9476eb9440f5 100644
--- 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)
60 else 60 else
61 base->icr_data &= ~mask; 61 base->icr_data &= ~mask;
62 if (base->icr_data & base->icr_mask) 62 if (base->icr_data & base->icr_mask)
63 custom.intreq = IF_SETCLR | base->int_mask; 63 amiga_custom.intreq = IF_SETCLR | base->int_mask;
64 return old & base->icr_mask; 64 return old & base->icr_mask;
65} 65}
66 66
@@ -89,7 +89,7 @@ unsigned char cia_able_irq(struct ciabase *base, unsigned char mask)
89 } 89 }
90 } 90 }
91 if (base->icr_data & base->icr_mask) 91 if (base->icr_data & base->icr_mask)
92 custom.intreq = IF_SETCLR | base->int_mask; 92 amiga_custom.intreq = IF_SETCLR | base->int_mask;
93 return old; 93 return old;
94} 94}
95 95
@@ -133,7 +133,7 @@ static irqreturn_t cia_handler(int irq, void *dev_id, struct pt_regs *fp)
133 mach_irq = base->cia_irq; 133 mach_irq = base->cia_irq;
134 irq = SYS_IRQS + mach_irq; 134 irq = SYS_IRQS + mach_irq;
135 ints = cia_set_irq(base, CIA_ICR_ALL); 135 ints = cia_set_irq(base, CIA_ICR_ALL);
136 custom.intreq = base->int_mask; 136 amiga_custom.intreq = base->int_mask;
137 for (i = 0; i < CIA_IRQS; i++, irq++, mach_irq++) { 137 for (i = 0; i < CIA_IRQS; i++, irq++, mach_irq++) {
138 if (ints & 1) { 138 if (ints & 1) {
139 kstat_cpu(0).irqs[irq]++; 139 kstat_cpu(0).irqs[irq]++;
@@ -162,7 +162,7 @@ void __init cia_init_IRQ(struct ciabase *base)
162 /* install CIA handler */ 162 /* install CIA handler */
163 request_irq(base->handler_irq, cia_handler, 0, base->name, base); 163 request_irq(base->handler_irq, cia_handler, 0, base->name, base);
164 164
165 custom.intena = IF_SETCLR | base->int_mask; 165 amiga_custom.intena = IF_SETCLR | base->int_mask;
166} 166}
167 167
168int cia_get_irq_list(struct ciabase *base, struct seq_file *p) 168int cia_get_irq_list(struct ciabase *base, struct seq_file *p)