Atari name clashes
Geert Uytterhoeven
maintainerPATCH 1/1 Atari name clashes
Atari Falcon: Prepend falcon_ to some Atari Falcon definitions to solve name clashes in some drivers
arch/m68k/atari/config.c +1 -1
@@ -344,7 +344,7 @@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 " ); }
include/asm-m68k/atarihw.h +2 -2
@@ -376,7 +376,7 @@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 @@u_char unused6;u_char gpio_data; }; -#define codec (*(volatile struct CODEC *)CODEC_BASE) +#define falcon_codec (*(volatile struct CODEC *)CODEC_BASE)/* ** Falcon Blitter
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds