xserver: Branch 'master'

[Greg Kroah-Hartman]

 hw/vfb/InitOutput.c |    2 ++
 1 files changed, 2 insertions(+)

New commits:
diff-tree 9f2793551f335e5fb08990fc8bb9e05e0ffb68d5 (from b20ae5ddb7682bafcee6f8bf0c8208a3f70b882b)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Mon Jun 19 11:50:47 2006 -0700

    fix compiler warning in hw/vfb/InitOutput.c

diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index 86e3fbe..212f79b 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -255,10 +255,12 @@ OsVendorFatalError()
 {
 }
 
+#if defined(DDXBEFORERESET)
 void ddxBeforeReset(void)
 {
     return;
 }
+#endif
 
 void
 ddxUseMsg()