summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2004-08-16 09:13:14 +0000
committerAdam Jackson <ajax@nwnk.net>2004-08-16 09:13:14 +0000
commitbbafc6d2fcb21671de3cfb4ff973409405162e7a (patch)
tree93d56f87b1ebb7f6c6fc922a7c1aa05ae0fc646f
parent8b6de7d388b7ae5169b2e38ad1a40981bc406cfc (diff)
list, so the loader knows not to complain about unresolved symbols when an optional module isn't loaded. This typically manifests as warnings about fbdevHW symbols when the user isn't using the framebuffer console.
-rw-r--r--src/nv_driver.c12
-rw-r--r--src/riva_driver.c10
2 files changed, 11 insertions, 11 deletions
diff --git a/src/nv_driver.c b/src/nv_driver.c
index 8d477d9..b55ece9 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c,v 1.3 2004/07/30 20:30:53 ajax Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c,v 1.4 2004/07/31 01:21:19 ajax Exp $ */
/* $XConsortium: nv_driver.c /main/3 1996/10/28 05:13:37 kaleb $ */
/*
* Copyright 1996-1997 David J. McKay
@@ -288,16 +288,16 @@ static const char *fbdevHWSymbols[] = {
"fbdevHWGetVidmem",
/* colormap */
- "fbdevHWLoadPalette",
+ "fbdevHWLoadPaletteWeak",
/* ScrnInfo hooks */
- "fbdevHWAdjustFrame",
+ "fbdevHWAdjustFrameWeak",
"fbdevHWEnterVT",
- "fbdevHWLeaveVT",
+ "fbdevHWLeaveVTWeak",
"fbdevHWModeInit",
"fbdevHWSave",
- "fbdevHWSwitchMode",
- "fbdevHWValidMode",
+ "fbdevHWSwitchModeWeak",
+ "fbdevHWValidModeWeak",
"fbdevHWMapMMIO",
"fbdevHWMapVidmem",
diff --git a/src/riva_driver.c b/src/riva_driver.c
index efe1eb4..e11772a 100644
--- a/src/riva_driver.c
+++ b/src/riva_driver.c
@@ -138,16 +138,16 @@ static const char *fbdevHWSymbols[] = {
"fbdevHWGetVidmem",
/* colormap */
- "fbdevHWLoadPalette",
+ "fbdevHWLoadPaletteWeak",
/* ScrnInfo hooks */
- "fbdevHWAdjustFrame",
+ "fbdevHWAdjustFrameWeak",
"fbdevHWEnterVT",
- "fbdevHWLeaveVT",
+ "fbdevHWLeaveVTWeak",
"fbdevHWModeInit",
"fbdevHWSave",
- "fbdevHWSwitchMode",
- "fbdevHWValidMode",
+ "fbdevHWSwitchModeWeak",
+ "fbdevHWValidModeWeak",
"fbdevHWMapMMIO",
"fbdevHWMapVidmem",