xserver: Branch 'server-1.5-branch'

[Adam Jackson]

 hw/xfree86/loader/xf86sym.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit f250352d2e6676af11d734c109f8edb0231f5164
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Mar 24 13:33:38 2008 -0400

    Bug #11508: Fix build without XV.
    (cherry picked from commit 87bfd3bd96c714a1c252d42408b5a1a4ff9dab06)

diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c
index f86a143..24fc44c 100644
--- a/hw/xfree86/loader/xf86sym.c
+++ b/hw/xfree86/loader/xf86sym.c
@@ -68,8 +68,10 @@
 # include "xf86Xinput.h"
 #endif
 #include "xf86OSmouse.h"
+#ifdef XV
 #include "xf86xv.h"
 #include "xf86xvmc.h"
+#endif
 #include "xf86cmap.h"
 #include "xf86fbman.h"
 #include "dgaproc.h"