From 9b714116b555ee1c3079d4f2933a1ae915847f92 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Sun, 22 Feb 2004 07:02:36 -0800 Subject: [PATCH] [PATCH] m68k: Atari name clashes From: Geert Uytterhoeven Atari Falcon: Prepend falcon_ to some Atari Falcon definitions to solve name clashes in some drivers. --- arch/m68k/atari/config.c | 2 +- include/asm-m68k/atarihw.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c index 3b782e0bad07d..6fa32330cc296 100644 --- 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 feb510043c500..ccd67aa8d0235 100644 --- 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 -- 2.53.0