[oe-commits] org.oe.dev linux-openmoko: sync 2.6.24 upstream

[john_lee commit]

linux-openmoko: sync 2.6.24 upstream

Author: john_lee at openmoko.com
Branch: org.openembedded.dev
Revision: 3b0c8d9f7199349c52f8598788cec4c2531b4ee9
ViewMTN: http://monotone.openembedded.org/revision/info/3b0c8d9f7199349c52f8598788cec4c2531b4ee9
Files:
1
packages/linux/linux-openmoko_2.6.24.bb
Diffs:

#
# mt diff -r7d76e5a73f9dadfcf85543e62ab68ee014c0cbf9 -r3b0c8d9f7199349c52f8598788cec4c2531b4ee9
#
#
#
# patch "packages/linux/linux-openmoko_2.6.24.bb"
#  from [5b0e2e911b276977abfcdff2351578f296bf5c81]
#    to [3f04ea50c2d039eb8d78888743eee5b4f6965629]
#
============================================================
--- packages/linux/linux-openmoko_2.6.24.bb	5b0e2e911b276977abfcdff2351578f296bf5c81
+++ packages/linux/linux-openmoko_2.6.24.bb	3f04ea50c2d039eb8d78888743eee5b4f6965629
@@ -5,9 +5,12 @@ KERNEL_RELEASE = "2.6.24"
 VANILLA_VERSION = "2.6.24"
 KERNEL_RELEASE = "2.6.24"
 
-PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
-PR = "r0"
+# need to synchronize with LOCALVERSION, if set
+KERNEL_VERSION = "${KERNEL_RELEASE}"
 
+PV = "${VANILLA_VERSION}+svnr${SRCREV}"
+PR = "r3"
+
 KERNEL_IMAGETYPE = "uImage"
 UBOOT_ENTRYPOINT = "30008000"
 
@@ -17,7 +20,6 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux
 SRCREV_FORMAT = "patches-rconfig"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
-#           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \
            svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=patches;proto=http;name=patches \
            svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=config;proto=http;name=config "
 
@@ -43,6 +45,9 @@ module_autoload_snd-soc-neo1973-wm8753 =
 module_autoload_g_ether = "g_ether"
 # audio
 module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753"
+module_autoload_snd-soc-neo1973-gta02-wm8753 = "snd-soc-neo1973-gta02-wm8753"
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_snd-mixer-oss = "snd-mixer-oss"
 # sd/mmc
 module_autoload_s3cmci = "s3cmci"