summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@freedesktop.org>2004-08-10 04:01:42 +0000
committerAdam Jackson <ajax@freedesktop.org>2004-08-10 04:01:42 +0000
commit30061d63e774097c3efd6b9c24dc06a70338ad5c (patch)
tree5f09f83903ace9ece164eec435c9f7c2a361552b
parent0270b0db1d6f9c1cba3234331cc330291d604cd8 (diff)
Bug #978: Silence unresolved symbol warnings from the ati driver. ReportedXORG-6_7_99_1
by Michel Daenzer.
-rw-r--r--src/atimodule.c8
-rw-r--r--src/r128_driver.c2
-rw-r--r--src/radeon_driver.c2
3 files changed, 7 insertions, 5 deletions
diff --git a/src/atimodule.c b/src/atimodule.c
index ed6b621..c83ee58 100644
--- a/src/atimodule.c
+++ b/src/atimodule.c
@@ -1,6 +1,6 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimodule.c,v 1.16 2003/05/28 14:08:03 tsi Exp $ */
/*
- * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
+ * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@ -39,6 +39,7 @@ const char *ATISymbols[] =
"ATILeaveVT",
"ATIFreeScreen",
"ATIValidMode",
+ "ATIFillInScreenInfo",
NULL
};
@@ -52,7 +53,8 @@ const char *R128Symbols[] =
"R128LeaveVT",
"R128FreeScreen",
"R128ValidMode",
- "R128Options",
+ "R128OptionsWeak",
+ "R128FillInScreenInfo",
NULL
};
@@ -77,7 +79,7 @@ static XF86ModuleVersionInfo ATIVersionRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
ATI_VERSION_MAJOR, ATI_VERSION_MINOR, ATI_VERSION_PATCH,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
diff --git a/src/r128_driver.c b/src/r128_driver.c
index 1d7f7dc..f6451fb 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -207,7 +207,7 @@ static const char *fbdevHWSymbols[] = {
"fbdevHWRestore",
"fbdevHWSave",
"fbdevHWSwitchMode",
- "fbdevHWValidMode",
+ "fbdevHWValidModeWeak",
"fbdevHWMapMMIO",
"fbdevHWMapVidmem",
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 14a4c7a..5337c63 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -242,7 +242,7 @@ static const char *fbdevHWSymbols[] = {
"fbdevHWRestore",
"fbdevHWSave",
"fbdevHWSwitchMode",
- "fbdevHWValidMode",
+ "fbdevHWValidModeWeak",
"fbdevHWMapMMIO",
"fbdevHWMapVidmem",