summaryrefslogtreecommitdiff
path: root/src/uxa/intel_driver.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2013-09-17 22:27:45 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2013-09-18 12:49:41 +0100
commitdcf9b5ae1889926007cf8a0efd127e9df3c909de (patch)
treea2788c2cff723b3dcb6587dc022596809c5038b0 /src/uxa/intel_driver.c
parent97b443f589fb62ba060f09a371be273549f524d0 (diff)
intel: Compile fixes for base install of SLED11.sp3
Highlights of that distribution include xorg-xserver-1.6.5, kernel 3.0.76 and gcc-4.3. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/uxa/intel_driver.c')
-rw-r--r--src/uxa/intel_driver.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c
index 675408da..7d716ebf 100644
--- a/src/uxa/intel_driver.c
+++ b/src/uxa/intel_driver.c
@@ -45,6 +45,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <stdio.h>
#include <errno.h>
+#include "xorg-server.h"
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86cmap.h"
@@ -54,7 +55,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "micmap.h"
#include "shadowfb.h"
#include <X11/extensions/randr.h>
-#include <X11/extensions/dpmsconst.h>
#include "fb.h"
#include "miscstruct.h"
#include "dixstruct.h"
@@ -225,8 +225,12 @@ static Bool I830GetEarlyOptions(ScrnInfoPtr scrn)
static Bool intel_option_cast_string_to_bool(intel_screen_private *intel,
int id, Bool val)
{
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,7,99,901,0)
xf86getBoolValue(&val, xf86GetOptValString(intel->Options, id));
return val;
+#else
+ return val;
+#endif
}
static void intel_check_dri_option(ScrnInfoPtr scrn)