diff options
Diffstat (limited to 'arch/ppc/amiga/cia.c')
-rw-r--r-- | arch/ppc/amiga/cia.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/ppc/amiga/cia.c b/arch/ppc/amiga/cia.c index ad961465b6cb..4431c58f611a 100644 --- a/arch/ppc/amiga/cia.c +++ b/arch/ppc/amiga/cia.c | |||
@@ -66,7 +66,7 @@ static unsigned char cia_set_irq_private(struct ciabase *base, | |||
66 | else | 66 | else |
67 | base->icr_data &= ~mask; | 67 | base->icr_data &= ~mask; |
68 | if (base->icr_data & base->icr_mask) | 68 | if (base->icr_data & base->icr_mask) |
69 | custom.intreq = IF_SETCLR | base->int_mask; | 69 | amiga_custom.intreq = IF_SETCLR | base->int_mask; |
70 | return old & base->icr_mask; | 70 | return old & base->icr_mask; |
71 | } | 71 | } |
72 | 72 | ||
@@ -114,7 +114,7 @@ static unsigned char cia_able_irq_private(struct ciabase *base, | |||
114 | base->icr_mask &= CIA_ICR_ALL; | 114 | base->icr_mask &= CIA_ICR_ALL; |
115 | 115 | ||
116 | if (base->icr_data & base->icr_mask) | 116 | if (base->icr_data & base->icr_mask) |
117 | custom.intreq = IF_SETCLR | base->int_mask; | 117 | amiga_custom.intreq = IF_SETCLR | base->int_mask; |
118 | return old; | 118 | return old; |
119 | } | 119 | } |
120 | 120 | ||
@@ -145,7 +145,7 @@ static void cia_handler(int irq, void *dev_id, struct pt_regs *fp) | |||
145 | irq = base->cia_irq; | 145 | irq = base->cia_irq; |
146 | desc = irq_desc + irq; | 146 | desc = irq_desc + irq; |
147 | ints = cia_set_irq_private(base, CIA_ICR_ALL); | 147 | ints = cia_set_irq_private(base, CIA_ICR_ALL); |
148 | custom.intreq = base->int_mask; | 148 | amiga_custom.intreq = base->int_mask; |
149 | for (i = 0; i < CIA_IRQS; i++, irq++) { | 149 | for (i = 0; i < CIA_IRQS; i++, irq++) { |
150 | if (ints & 1) { | 150 | if (ints & 1) { |
151 | kstat_cpu(0).irqs[irq]++; | 151 | kstat_cpu(0).irqs[irq]++; |
@@ -174,5 +174,5 @@ void __init cia_init_IRQ(struct ciabase *base) | |||
174 | action->name = base->name; | 174 | action->name = base->name; |
175 | setup_irq(base->handler_irq, &amiga_sys_irqaction[base->handler_irq-IRQ_AMIGA_AUTO]); | 175 | setup_irq(base->handler_irq, &amiga_sys_irqaction[base->handler_irq-IRQ_AMIGA_AUTO]); |
176 | 176 | ||
177 | custom.intena = IF_SETCLR | base->int_mask; | 177 | amiga_custom.intena = IF_SETCLR | base->int_mask; |
178 | } | 178 | } |