[PATCH] m68k: Atari name clashes

From: Geert Uytterhoeven <geert@linux-m68k.org>

Atari Falcon: Prepend falcon_ to some Atari Falcon definitions to solve name
clashes in some drivers.

diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c
index 3b782e0bad07d5605ae7fedcaf00b64932001cdd..6fa32330cc296d5d601fa8777abb553161ad340e 100644 (file)
--- a/arch/m68k/atari/config.c
+++ b/arch/m68k/atari/config.c
@@ -344,7 +344,7 @@ void __init config_atari(void)
        ATARIHW_SET(PCM_8BIT);
         printk( "PCM " );
     }
-    if (!MACH_IS_HADES && hwreg_present( &codec.unused5 )) {
+    if (!MACH_IS_HADES && hwreg_present( &falcon_codec.unused5 )) {
        ATARIHW_SET(CODEC);
         printk( "CODEC " );
     }

diff --git a/include/asm-m68k/atarihw.h b/include/asm-m68k/atarihw.h
index feb510043c50012575b6e3c381c36f3c043388b5..ccd67aa8d023501d8311855dfc1893f918f78ffe 100644 (file)
--- a/include/asm-m68k/atarihw.h
+++ b/include/asm-m68k/atarihw.h
@@ -376,7 +376,7 @@ struct MATRIX
   u_char external_frequency_divider;
   u_char internal_frequency_divider;
 };
-#define matrix (*(volatile struct MATRIX *)MATRIX_BASE)
+#define falcon_matrix (*(volatile struct MATRIX *)MATRIX_BASE)
 
 #define CODEC_BASE (0xffff8936)
 struct CODEC
@@ -405,7 +405,7 @@ struct CODEC
   u_char unused6;
   u_char gpio_data;
 };
-#define codec (*(volatile struct CODEC *)CODEC_BASE)
+#define falcon_codec (*(volatile struct CODEC *)CODEC_BASE)
 
 /*
 ** Falcon Blitter