xf86-video-intel: src/i830.h src/i830_lvds.c

[Eric Anholt]

 src/i830.h      |    2 +-
 src/i830_lvds.c |    5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit f126aabdf8952177bb15f392041da7a7094eb31b
Author: Eric Anholt <eric at anholt.net>
Date:   Wed Jan 21 12:52:36 2009 -0800

    Fix build with server 1.4.
    
    Debian "unstable" is still stuck with this ancient version.

diff --git a/src/i830.h b/src/i830.h
index 4ee9c39..50d29cd 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -539,8 +539,8 @@ typedef struct _I830Rec {
 #ifdef I830_USE_UXA
    uxa_driver_t *uxa_driver;
    Bool need_flush;
-   Bool need_sync;
 #endif
+   Bool need_sync;
 #if defined(I830_USE_EXA) || defined(I830_USE_UXA)
    PixmapPtr pSrcPixmap;
 #endif
diff --git a/src/i830_lvds.c b/src/i830_lvds.c
index 7eac3c2..027bb5d 100644
--- a/src/i830_lvds.c
+++ b/src/i830_lvds.c
@@ -917,6 +917,11 @@ static void fill_detailed_block(struct detailed_monitor_section *det_mon,
         timing->misc |= 0x01;
 }
 
+/* X Server pre-1.5 compatibility */
+#ifndef DS_VENDOR
+#define DS_VENDOR 0x101
+#endif
+
 /**
  * Return the list of DDC modes if available, or the BIOS fixed mode otherwise.
  */