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

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


---

 25-akpm/arch/m68k/atari/config.c   |    2 +-
 25-akpm/include/asm-m68k/atarihw.h |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff -puN arch/m68k/atari/config.c~m68k-396 arch/m68k/atari/config.c
--- 25/arch/m68k/atari/config.c~m68k-396	Fri Feb 20 15:09:04 2004
+++ 25-akpm/arch/m68k/atari/config.c	Fri Feb 20 15:09:04 2004
@@ -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 -puN include/asm-m68k/atarihw.h~m68k-396 include/asm-m68k/atarihw.h
--- 25/include/asm-m68k/atarihw.h~m68k-396	Fri Feb 20 15:09:04 2004
+++ 25-akpm/include/asm-m68k/atarihw.h	Fri Feb 20 15:09:04 2004
@@ -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

_