[oe-commits] Martin Jansa : shr/merge: Switch from preferred-xorg-versions-live. inc to updated preferred-xorg-versions-X11R7.5.inc

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: fffd0d981666e9c5aab1f734e27590eb7be3a38d
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=fffd0d981666e9c5aab1f734e27590eb7be3a38d

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Fri Oct 30 11:07:07 2009 +0000

shr/merge: Switch from preferred-xorg-versions-live.inc to updated preferred-xorg-versions-X11R7.5.inc

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 conf/distro/include/shr-autorev.inc |    1 -
 conf/distro/shr.conf                |    1 +
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/conf/distro/include/shr-autorev.inc b/conf/distro/include/shr-autorev.inc
index 23afe1b..b8ad921 100644
--- a/conf/distro/include/shr-autorev.inc
+++ b/conf/distro/include/shr-autorev.inc
@@ -9,7 +9,6 @@ SRCREV_pn-linux-openmoko-shr-devel = "${AUTOREV}"
 SRCREV_pn-linux-openmoko-shr-drm-devel = "${AUTOREV}"
 
 # X11
-require conf/distro/include/preferred-xorg-versions-live.inc
 SRCREV_pn-xf86-video-glamo = "${AUTOREV}"
 SRCREV_pn-xf86-input-mouse = "${AUTOREV}"
 SRCREV_pn-xf86-input-keyboard = "${AUTOREV}"
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index f337d5b..5685718 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -30,6 +30,7 @@ DISTRO = "shr"
 # specific file here (if it exists).
 include conf/distro/include/shr-${MACHINE}.conf
 
+require conf/distro/include/preferred-xorg-versions-X11R7.5.inc
 require conf/distro/include/preferred-shr-versions.inc
 require conf/distro/include/shr-autorev.inc