From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Linus Torvalds <torvalds@osdl.org>, Andrew Morton <akpm@osdl.org>
Cc: Linux Kernel Development <linux-kernel@vger.kernel.org>,
Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [PATCH 396] Atari name clashes
Date: Fri, 20 Feb 2004 13:46:40 +0100 [thread overview]
Message-ID: <200402201246.i1KCkerW004205@callisto.of.borg> (raw)
Atari Falcon: Prepend falcon_ to some Atari Falcon definitions to solve name
clashes in some drivers
--- linux-2.6.3/arch/m68k/atari/config.c 2003-05-27 19:02:32.000000000 +0200
+++ linux-m68k-2.6.3/arch/m68k/atari/config.c 2004-01-10 18:22:50.000000000 +0100
@@ -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 " );
}
--- linux-2.6.3/include/asm-m68k/atarihw.h 2002-07-25 12:54:07.000000000 +0200
+++ linux-m68k-2.6.3/include/asm-m68k/atarihw.h 2004-01-10 18:18:17.000000000 +0100
@@ -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 -- geert@linux-m68k.org
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
reply other threads:[~2004-02-20 12:49 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200402201246.i1KCkerW004205@callisto.of.borg \
--to=geert@linux-m68k.org \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®