From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Andrew Morton <akpm@osdl.org>
Cc: Linus Torvalds <torvalds@osdl.org>,
Linux Kernel list <linux-kernel@vger.kernel.org>
Subject: [PATCH] Fix building both old & new radeonfb's
Date: Tue, 17 Feb 2004 11:16:45 +1100 [thread overview]
Message-ID: <1076977005.1056.124.camel@gaston> (raw)
This fix build of "allyesconfig", old and new radeonfb's would
collide on some symbols.
Ben.
===== drivers/video/fbmem.c 1.88 vs edited =====
--- 1.88/drivers/video/fbmem.c Tue Feb 17 04:58:08 2004
+++ edited/drivers/video/fbmem.c Tue Feb 17 10:58:14 2004
@@ -138,6 +138,8 @@
extern int tx3912fb_setup(char*);
extern int radeonfb_init(void);
extern int radeonfb_setup(char*);
+extern int radeonfb_old_init(void);
+extern int radeonfb_old_setup(char*);
extern int e1355fb_init(void);
extern int e1355fb_setup(char*);
extern int pvr2fb_init(void);
@@ -226,7 +228,7 @@
{ "radeonfb", radeonfb_init, radeonfb_setup },
#endif
#ifdef CONFIG_FB_RADEON_OLD
- { "radeonfb_old", radeonfb_init, radeonfb_setup },
+ { "radeonfb_old", radeonfb_old_init, radeonfb_old_setup },
#endif
#ifdef CONFIG_FB_CONTROL
{ "controlfb", control_init, control_setup },
===== drivers/video/radeonfb.c 1.37 vs edited =====
--- 1.37/drivers/video/radeonfb.c Fri Feb 13 04:14:53 2004
+++ edited/drivers/video/radeonfb.c Tue Feb 17 10:57:34 2004
@@ -234,7 +234,7 @@
/* these common regs are cleared before mode setting so they do not
* interfere with anything
*/
-reg_val common_regs[] = {
+static reg_val common_regs[] = {
{ OVR_CLR, 0 },
{ OVR_WID_LEFT_RIGHT, 0 },
{ OVR_WID_TOP_BOTTOM, 0 },
@@ -246,7 +246,7 @@
{ CAP0_TRIG_CNTL, 0 },
};
-reg_val common_regs_m6[] = {
+static reg_val common_regs_m6[] = {
{ OVR_CLR, 0 },
{ OVR_WID_LEFT_RIGHT, 0 },
{ OVR_WID_TOP_BOTTOM, 0 },
@@ -3134,19 +3134,19 @@
};
-int __init radeonfb_init (void)
+int __init radeonfb_old_init (void)
{
return pci_module_init (&radeonfb_driver);
}
-void __exit radeonfb_exit (void)
+void __exit radeonfb_old_exit (void)
{
pci_unregister_driver (&radeonfb_driver);
}
-int __init radeonfb_setup (char *options)
+int __init radeonfb_old_setup (char *options)
{
char *this_opt;
@@ -3174,8 +3174,8 @@
}
#ifdef MODULE
-module_init(radeonfb_init);
-module_exit(radeonfb_exit);
+module_init(radeonfb_old_init);
+module_exit(radeonfb_old_exit);
#endif
===== drivers/video/aty/radeon_base.c 1.7 vs edited =====
--- 1.7/drivers/video/aty/radeon_base.c Mon Feb 16 14:56:24 2004
+++ edited/drivers/video/aty/radeon_base.c Tue Feb 17 10:37:53 2004
@@ -212,7 +212,7 @@
/* these common regs are cleared before mode setting so they do not
* interfere with anything
*/
-reg_val common_regs[] = {
+static reg_val common_regs[] = {
{ OVR_CLR, 0 },
{ OVR_WID_LEFT_RIGHT, 0 },
{ OVR_WID_TOP_BOTTOM, 0 },
@@ -224,7 +224,7 @@
{ CAP0_TRIG_CNTL, 0 },
};
-reg_val common_regs_m6[] = {
+static reg_val common_regs_m6[] = {
{ OVR_CLR, 0 },
{ OVR_WID_LEFT_RIGHT, 0 },
{ OVR_WID_TOP_BOTTOM, 0 },
reply other threads:[~2004-02-17 0:17 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=1076977005.1056.124.camel@gaston \
--to=benh@kernel.crashing.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