[oe-commits] Martin Jansa : linux-openmoko-shr-drm-devel: switch back to drm-tracking branch

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 117485f14d53a0eeddd1bda873812e6cd79b8892
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=117485f14d53a0eeddd1bda873812e6cd79b8892

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Nov 20 11:00:43 2009 +0100

linux-openmoko-shr-drm-devel: switch back to drm-tracking branch

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 conf/distro/include/sane-srcrevs.inc              |    2 +-
 recipes/linux/linux-openmoko-shr-drm-devel_git.bb |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 23c0b6b..ef5bb43 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -165,7 +165,7 @@ SRCREV_pn-linux-openmoko-2.6.28 ?= "8aa6cdde17381dd8865d10ba15ee62c092ec2ba5"
 SRCREV_pn-linux-openmoko-2.6.31 ?= "4331f6c95fadc37ea89359d6afb915be838790f9"
 SRCREV_pn-linux-openmoko-devel ?= "b9aa5bf345a0b802af0d10b6cf1079738fe4fd12"
 SRCREV_pn-linux-openmoko-shr-devel ?= "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5"
-SRCREV_pn-linux-openmoko-shr-drm-devel ?= "44d09f40c5c01989bb41bdefe56dd615ea49bbf8"
+SRCREV_pn-linux-openmoko-shr-drm-devel ?= "53cf49505d15824ebbb50aa3c86ba4b059c0ac64"
 SRCREV_pn-linux-sgh-i900 ?= "7e5f8bd3864485e5fc66cb946e09f18b5a32cebc"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
diff --git a/recipes/linux/linux-openmoko-shr-drm-devel_git.bb b/recipes/linux/linux-openmoko-shr-drm-devel_git.bb
index 6b68879..671ad75 100644
--- a/recipes/linux/linux-openmoko-shr-drm-devel_git.bb
+++ b/recipes/linux/linux-openmoko-shr-drm-devel_git.bb
@@ -7,13 +7,12 @@ DEFAULT_PREFERENCE = "-1"
 KERNEL_RELEASE = "2.6.29"
 KERNEL_VERSION = "2.6.29-rc3-drm"
 
-OMV = "oe14"
+OMV = "oe15"
 PV = "${KERNEL_RELEASE}-drm-${OMV}+gitr${SRCREV}"
 PR = "r2"
 
 SRC_URI = "\
-#  git://git.openmoko.org/git/kernel.git;protocol=git;branch=drm-tracking \
-  git://git.bitwiz.org.uk/kernel.git;protocol=git;branch=kms-tests \
+  git://git.openmoko.org/git/kernel.git;protocol=git;branch=drm-tracking \
   file://fix-install.patch;patch=1 \
   file://0001-Add-drm-to-Makefile-version.patch;patch=1 \
   file://0001-Fix-s3c-adc-suspend.patch;patch=1 \