summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Yuan <shengquan.yuan@intel.com>2009-05-25 13:55:52 +0800
committerAustin Yuan <shengquan.yuan@intel.com>2009-05-25 13:55:52 +0800
commite7b7ae0ab6b837e0d933135a4fac7d26e8686d65 (patch)
tree60852be55cc561d457737817169a77e772d6d427
parente743df7ced70bbac86a9de4a405f724b0f63ac2a (diff)
parent05c1104a183fc9e31441c96d6d8cecb54c99b581 (diff)
downloadlibva-e7b7ae0ab6b837e0d933135a4fac7d26e8686d65.tar.gz
Merge branch 'master' of ssh://git@moblin-mdi.jf.intel.com/umg-moorestown-libvamenlow-port_05282009_Alpha2.105282009_Alpha2.1
-rw-r--r--src/X11/va_dri2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/X11/va_dri2.c b/src/X11/va_dri2.c
index c2d014d..8ca80e2 100644
--- a/src/X11/va_dri2.c
+++ b/src/X11/va_dri2.c
@@ -37,10 +37,10 @@
#include <X11/extensions/extutil.h>
#include "xf86drm.h"
#include "va_dri2.h"
-#include "va_dri2tokens.h"
#include "va_dri2str.h"
#ifndef DRI2DriverDRI
+#include "va_dri2tokens.h"
#define DRI2DriverDRI 0
#endif