From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 3 Feb 2008 23:42:34 +0000 (+0000)
Subject: linux-openmoko: 4014 removes the moko11 suffix again
X-Git-Tag: Release-2010-05/1~7765^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59016966acd6b2c966a5bf96c61ffaa5215d4cf0;p=openembedded.git

linux-openmoko: 4014 removes the moko11 suffix again
---

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 3411f2bb19..c8b67efb7a 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -45,7 +45,7 @@ SRCREV_pn-libxosd ?= "627"
 SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-ixp4xx ?= "1021"
-SRCREV_pn-linux-openmoko ?= "4013"
+SRCREV_pn-linux-openmoko ?= "4014"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
 SRCREV_pn-maemo-mapper ?= "118"
diff --git a/packages/linux/linux-openmoko_2.6.24.bb b/packages/linux/linux-openmoko_2.6.24.bb
index 0c63fc9bbd..b316f4ae4e 100644
--- a/packages/linux/linux-openmoko_2.6.24.bb
+++ b/packages/linux/linux-openmoko_2.6.24.bb
@@ -5,10 +5,11 @@ DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/
 VANILLA_VERSION = "2.6.24"
 KERNEL_RELEASE = "2.6.24"
 
-KERNEL_VERSION = "${KERNEL_RELEASE}-moko11"
+# need to synchronize with LOCALVERSION, if set
+KERNEL_VERSION = "${KERNEL_RELEASE}"
 
 PV = "${VANILLA_VERSION}+svnr${SRCREV}"
-PR = "r2"
+PR = "r3"
 
 KERNEL_IMAGETYPE = "uImage"
 UBOOT_ENTRYPOINT = "30008000"