summaryrefslogtreecommitdiff
path: root/xc/programs/Xserver/hw/xfree86/xf86cfg
diff options
context:
space:
mode:
authordawes <dawes>2000-11-30 18:49:38 +0000
committerdawes <dawes>2000-11-30 18:49:38 +0000
commit055ef92b0fcbf4afffd0a6b1e0593f3e9c44b623 (patch)
treec75c2f8883c8b6fff44f9c7b0aea55be7c4f3001 /xc/programs/Xserver/hw/xfree86/xf86cfg
parentd129f7fd02961869422c111dd8c3cf824bc54243 (diff)
XFree86 4.0.1f mergeX_4_0_1f-20001130-merge
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/xf86cfg')
-rw-r--r--xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c5
-rw-r--r--xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.c3
2 files changed, 2 insertions, 6 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c b/xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c
index 6d836644c..4a562d422 100644
--- a/xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c
+++ b/xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,v 1.1 2000/10/20 14:59:05 alanh Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,v 1.2 2000/11/08 17:58:43 alanh Exp $
*/
#define LOADER_PRIVATE
#include "loader.h"
@@ -227,9 +227,6 @@ LOOKUP xfree86LookupTab[] = {
SYMFUNC(xf86shmctl)
SYMFUNC(xf86setjmp)
SYMFUNC(xf86longjmp)
-#ifdef __alpha__
- SYMFUNC(_bus_base)
-#endif
SYMFUNC(xf86AddDriver)
{0,0}
diff --git a/xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.c b/xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.c
index e9dafe5cf..9316a5211 100644
--- a/xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.c
+++ b/xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.c
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.c,v 1.3 2000/10/20 14:59:08 alanh Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.c,v 1.4 2000/11/14 21:59:24 dawes Exp $
*/
/*
@@ -34,7 +34,6 @@
*/
#include "vidmode.h"
-#include <X11/extensions/Xinerama.h>
#include <X11/Xaw/Command.h>
#include <X11/Xaw/Form.h>
#include <X11/Xaw/Label.h>