4 files changed, 6 insertions, 5 deletions

diff --git a/meta-moblin/conf/distro/include/moblin-2.0-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-2.0-fixed-revisions.inc
index e765b1df90..5992ed91ce 100644
--- a/meta-moblin/conf/distro/include/moblin-2.0-fixed-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-2.0-fixed-revisions.inc
@@ -9,7 +9,7 @@ PREFERRED_VERSION_gtk+ ?= "2.16.4"
 PREFERRED_VERSION_udev ?= "145"
 
 PREFERRED_VERSION_mesa-dri ?= "7.5"
-PREFERRED_VERSION_xf86-video-intel ?= "2.7.1"
+PREFERRED_VERSION_xf86-video-intel ?= "2.12.0"
 PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.6.0"
 PREFERRED_VERSION_libxcb ?= "1.3"
 PREFERRED_VERSION_xcb-proto ?= "1.5"
diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
index a96bd47ac0..55ba546d67 100644
--- a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
@@ -9,8 +9,8 @@ PREFERRED_VERSION_gtk+ ?= "2.18.5"
 PREFERRED_VERSION_pango = "1.26.0"
 PREFERRED_VERSION_udev ?= "145"
 
-PREFERRED_VERSION_mesa-dri ?= "7.7"
-PREFERRED_VERSION_xf86-video-intel ?= "2.10.0"
+PREFERRED_VERSION_mesa-dri ?= "7.8.2"
+PREFERRED_VERSION_xf86-video-intel ?= "2.12.0"
 PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.7.99.2"
 PREFERRED_VERSION_libxcb ?= "1.3"
 PREFERRED_VERSION_xcb-proto ?= "1.5"
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 66a473b668..1085c6309b 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -146,6 +146,6 @@ PREFERRED_VERSION_xf86-input-evdev ?= "2.4.0"
 PREFERRED_VERSION_xf86-input-mouse ?= "1.5.0"
 PREFERRED_VERSION_xf86-input-keyboard ?= "1.4.0"
 PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.1"
-PREFERRED_VERSION_xf86-video-intel ?= "2.10.0"
+PREFERRED_VERSION_xf86-video-intel ?= "2.12.0"
 
 
diff --git a/meta/packages/xorg-driver/xf86-video-intel_2.10.0.bb b/meta/packages/xorg-driver/xf86-video-intel_2.12.0.bb
index f60bdd2697..c04c7bd0ee 100644
--- a/meta/packages/xorg-driver/xf86-video-intel_2.10.0.bb
+++ b/meta/packages/xorg-driver/xf86-video-intel_2.12.0.bb
@@ -1,8 +1,9 @@
 require xf86-video-common.inc
 
+DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
+
 EXTRA_OECONF += "--disable-xvmc"
 
-DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
 DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \
             virtual/libgl xineramaproto xf86driproto libpciaccess"