[PATCH] m68k: namespace pollution fix (custom->amiga_custom)

in amigahw.h custom renamed to amiga_custom, in drivers with few instances the
same replacement, in the rest - #define custom amiga_custom in driver itself

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 8 insertions, 8 deletions

diff --git a/arch/ppc/platforms/apus_setup.c b/arch/ppc/platforms/apus_setup.c
index 2f74fde98ebc..f62179f14cbb 100644
--- a/arch/ppc/platforms/apus_setup.c
+++ b/arch/ppc/platforms/apus_setup.c
@@ -574,9 +574,9 @@ static __inline__ void ser_RTSon(void)
 
 int __debug_ser_out( unsigned char c )
 {
-        custom.serdat = c | 0x100;
+        amiga_custom.serdat = c | 0x100;
         mb();
-        while (!(custom.serdatr & 0x2000))
+        while (!(amiga_custom.serdatr & 0x2000))
                 barrier();
         return 1;
 }
@@ -586,11 +586,11 @@ unsigned char __debug_ser_in( void )
         unsigned char c;
 
         /* XXX: is that ok?? derived from amiga_ser.c... */
-        while( !(custom.intreqr & IF_RBF) )
+        while( !(amiga_custom.intreqr & IF_RBF) )
                 barrier();
-        c = custom.serdatr;
+        c = amiga_custom.serdatr;
         /* clear the interrupt, so that another character can be read */
-        custom.intreq = IF_RBF;
+        amiga_custom.intreq = IF_RBF;
         return c;
 }
 
@@ -601,10 +601,10 @@ int __debug_serinit( void )
         local_irq_save(flags);
 
         /* turn off Rx and Tx interrupts */
-        custom.intena = IF_RBF | IF_TBE;
+        amiga_custom.intena = IF_RBF | IF_TBE;
 
         /* clear any pending interrupt */
-        custom.intreq = IF_RBF | IF_TBE;
+        amiga_custom.intreq = IF_RBF | IF_TBE;
 
         local_irq_restore(flags);
 
@@ -617,7 +617,7 @@ int __debug_serinit( void )
 
 #ifdef CONFIG_KGDB
         /* turn Rx interrupts on for GDB */
-        custom.intena = IF_SETCLR | IF_RBF;
+        amiga_custom.intena = IF_SETCLR | IF_RBF;
         ser_RTSon();
 #endif