Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2004-02-16 00:23:47 -0800
committerLinus Torvalds <torvalds@home.osdl.org>2004-02-16 00:23:47 -0800
commit78d27422be4b1b26fe7eba18868658b8644f4be6 (patch)
tree66d866a62791313b18aac289a41d2fb282243841
parentf67020a433c2af9c3b6e4922a97a87ae3c51c340 (diff)
[PATCH] Fix building both old & new radeonfb's
This fixes the build of "allyesconfig", old and new radeonfb's would collide on some symbols.
-rw-r--r--drivers/video/aty/radeon_base.c4
-rw-r--r--drivers/video/fbmem.c4
-rw-r--r--drivers/video/radeonfb.c14
3 files changed, 12 insertions, 10 deletions
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index d629e66f55d0..bd2c1264f52c 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -212,7 +212,7 @@ typedef struct {
/* 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 @@ reg_val common_regs[] = {
{ 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 },
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 4ec4f05c819e..ce5d053ca63d 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -138,6 +138,8 @@ extern int tx3912fb_init(void);
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 @@ static struct {
{ "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 },
diff --git a/drivers/video/radeonfb.c b/drivers/video/radeonfb.c
index 06764b143c8b..ee54ad812354 100644
--- a/drivers/video/radeonfb.c
+++ b/drivers/video/radeonfb.c
@@ -234,7 +234,7 @@ typedef struct {
/* 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 @@ reg_val common_regs[] = {
{ 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 @@ static struct pci_driver radeonfb_driver = {
};
-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 @@ int __init radeonfb_setup (char *options)
}
#ifdef MODULE
-module_init(radeonfb_init);
-module_exit(radeonfb_exit);
+module_init(radeonfb_old_init);
+module_exit(radeonfb_old_exit);
#endif