1 files changed, 20 insertions, 20 deletions

diff --git a/arch/ppc/amiga/amiints.c b/arch/ppc/amiga/amiints.c
index 91195e2ce38d..5f35cf3986f7 100644
--- a/arch/ppc/amiga/amiints.c
+++ b/arch/ppc/amiga/amiints.c
@@ -96,8 +96,8 @@ void amiga_init_IRQ(void)
                 gayle.inten = GAYLE_IRQ_IDE;
 
         /* turn off all interrupts... */
-        custom.intena = 0x7fff;
-        custom.intreq = 0x7fff;
+        amiga_custom.intena = 0x7fff;
+        amiga_custom.intreq = 0x7fff;
 
 #ifdef CONFIG_APUS
         /* Clear any inter-CPU interrupt requests. Circumvents bug in
@@ -110,7 +110,7 @@ void amiga_init_IRQ(void)
         APUS_WRITE(APUS_IPL_EMU, IPLEMU_SETRESET | IPLEMU_IPLMASK);
 #endif
         /* ... and enable the master interrupt bit */
-        custom.intena = IF_SETCLR | IF_INTEN;
+        amiga_custom.intena = IF_SETCLR | IF_INTEN;
 
         cia_init_IRQ(&ciaa_base);
         cia_init_IRQ(&ciab_base);
@@ -151,7 +151,7 @@ void amiga_enable_irq(unsigned int irq)
         }
 
         /* enable the interrupt */
-        custom.intena = IF_SETCLR | ami_intena_vals[irq];
+        amiga_custom.intena = IF_SETCLR | ami_intena_vals[irq];
 }
 
 void amiga_disable_irq(unsigned int irq)
@@ -177,7 +177,7 @@ void amiga_disable_irq(unsigned int irq)
         }
 
         /* disable the interrupt */
-        custom.intena = ami_intena_vals[irq];
+        amiga_custom.intena = ami_intena_vals[irq];
 }
 
 inline void amiga_do_irq(int irq, struct pt_regs *fp)
@@ -196,7 +196,7 @@ void amiga_do_irq_list(int irq, struct pt_regs *fp)
 
         kstat_cpu(0).irqs[irq]++;
 
-        custom.intreq = ami_intena_vals[irq];
+        amiga_custom.intreq = ami_intena_vals[irq];
 
         for (action = desc->action; action; action = action->next)
                 action->handler(irq, action->dev_id, fp);
@@ -208,40 +208,40 @@ void amiga_do_irq_list(int irq, struct pt_regs *fp)
 
 static void ami_int1(int irq, void *dev_id, struct pt_regs *fp)
 {
-        unsigned short ints = custom.intreqr & custom.intenar;
+        unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
 
         /* if serial transmit buffer empty, interrupt */
         if (ints & IF_TBE) {
-                custom.intreq = IF_TBE;
+                amiga_custom.intreq = IF_TBE;
                 amiga_do_irq(IRQ_AMIGA_TBE, fp);
         }
 
         /* if floppy disk transfer complete, interrupt */
         if (ints & IF_DSKBLK) {
-                custom.intreq = IF_DSKBLK;
+                amiga_custom.intreq = IF_DSKBLK;
                 amiga_do_irq(IRQ_AMIGA_DSKBLK, fp);
         }
 
         /* if software interrupt set, interrupt */
         if (ints & IF_SOFT) {
-                custom.intreq = IF_SOFT;
+                amiga_custom.intreq = IF_SOFT;
                 amiga_do_irq(IRQ_AMIGA_SOFT, fp);
         }
 }
 
 static void ami_int3(int irq, void *dev_id, struct pt_regs *fp)
 {
-        unsigned short ints = custom.intreqr & custom.intenar;
+        unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
 
         /* if a blitter interrupt */
         if (ints & IF_BLIT) {
-                custom.intreq = IF_BLIT;
+                amiga_custom.intreq = IF_BLIT;
                 amiga_do_irq(IRQ_AMIGA_BLIT, fp);
         }
 
         /* if a copper interrupt */
         if (ints & IF_COPER) {
-                custom.intreq = IF_COPER;
+                amiga_custom.intreq = IF_COPER;
                 amiga_do_irq(IRQ_AMIGA_COPPER, fp);
         }
 
@@ -252,36 +252,36 @@ static void ami_int3(int irq, void *dev_id, struct pt_regs *fp)
 
 static void ami_int4(int irq, void *dev_id, struct pt_regs *fp)
 {
-        unsigned short ints = custom.intreqr & custom.intenar;
+        unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
 
         /* if audio 0 interrupt */
         if (ints & IF_AUD0) {
-                custom.intreq = IF_AUD0;
+                amiga_custom.intreq = IF_AUD0;
                 amiga_do_irq(IRQ_AMIGA_AUD0, fp);
         }
 
         /* if audio 1 interrupt */
         if (ints & IF_AUD1) {
-                custom.intreq = IF_AUD1;
+                amiga_custom.intreq = IF_AUD1;
                 amiga_do_irq(IRQ_AMIGA_AUD1, fp);
         }
 
         /* if audio 2 interrupt */
         if (ints & IF_AUD2) {
-                custom.intreq = IF_AUD2;
+                amiga_custom.intreq = IF_AUD2;
                 amiga_do_irq(IRQ_AMIGA_AUD2, fp);
         }
 
         /* if audio 3 interrupt */
         if (ints & IF_AUD3) {
-                custom.intreq = IF_AUD3;
+                amiga_custom.intreq = IF_AUD3;
                 amiga_do_irq(IRQ_AMIGA_AUD3, fp);
         }
 }
 
 static void ami_int5(int irq, void *dev_id, struct pt_regs *fp)
 {
-        unsigned short ints = custom.intreqr & custom.intenar;
+        unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
 
         /* if serial receive buffer full interrupt */
         if (ints & IF_RBF) {
@@ -291,7 +291,7 @@ static void ami_int5(int irq, void *dev_id, struct pt_regs *fp)
 
         /* if a disk sync interrupt */
         if (ints & IF_DSKSYN) {
-                custom.intreq = IF_DSKSYN;
+                amiga_custom.intreq = IF_DSKSYN;
                 amiga_do_irq(IRQ_AMIGA_DSKSYN, fp);
         }
 }