xserver: Branch 'master'

[Greg Kroah-Hartman]

 hw/dmx/dmxinit.c |    3 ---
 include/dix.h    |    6 ++++++
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
diff-tree cc465800ddca5fb6c9ec09fdfa8f1f05359cf396 (from 785c9789704ed142fe98cd17b5995e4a95b7141f)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Wed Jun 7 14:03:35 2006 -0700

    Fix compiler warnings about SetVendorRelease and SetVendorString

diff --git a/hw/dmx/dmxinit.c b/hw/dmx/dmxinit.c
index ddc4d2b..e7f04df 100644
--- a/hw/dmx/dmxinit.c
+++ b/hw/dmx/dmxinit.c
@@ -78,9 +78,6 @@ extern void GlxSetVisualConfigs(
 );
 #endif /* GLXEXT */
 
-extern void SetVendorRelease(int release); /* in dix/main.c */
-extern void SetVendorString(char *string); /* in dix/main.c */
-
 /* Global variables available to all Xserver/hw/dmx routines. */
 int             dmxNumScreens;
 DMXScreenInfo  *dmxScreens;
diff --git a/include/dix.h b/include/dix.h
index 1687f75..9fc5b07 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -516,6 +516,12 @@ extern void FreeAllAtoms(void);
 
 extern void InitAtoms(void);
 
+/* main.c */
+
+extern void SetVendorRelease(int release);
+
+extern void SetVendorString(char *string);
+
 /* events.c */
 
 extern void SetMaskForEvent(