summaryrefslogtreecommitdiff
path: root/recipes/linux/linux-omap-pm_2.6.29.bb
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2009-06-22 23:26:27 +0400
committerDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2009-06-22 23:26:27 +0400
commit0dcaad77742245477b34542b49c66e91d16a147d (patch)
tree39d249bcd89e10b7536a887722e78a354d8c7801 /recipes/linux/linux-omap-pm_2.6.29.bb
parent0319a593f77ce050606bc3aa469f607ae1b69870 (diff)
parentadb9174a2feaf3718b72256adc35580313f328c7 (diff)
Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/linux/linux-omap-pm_2.6.29.bb')
-rw-r--r--recipes/linux/linux-omap-pm_2.6.29.bb4
1 files changed, 3 insertions, 1 deletions
diff --git a/recipes/linux/linux-omap-pm_2.6.29.bb b/recipes/linux/linux-omap-pm_2.6.29.bb
index 9748278389..80303774f3 100644
--- a/recipes/linux/linux-omap-pm_2.6.29.bb
+++ b/recipes/linux/linux-omap-pm_2.6.29.bb
@@ -7,7 +7,8 @@ COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|
SRCREV = "cbfc461bd5c4d0aff8501dd82db18146a22f49cf"
-PV = "2.6.29-pm1+gitr${SRCREV}"
+PV = "2.6.29"
+MACHINE_KERNEL_PR_append = "-pm1+gitr${SRCREV}"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git;protocol=git;branch=pm-2.6.29 \
file://defconfig"
@@ -93,6 +94,7 @@ SRC_URI_append = " \
file://dss2/merge-fixups.diff;patch=1 \
file://overo-cpufreq.diff;patch=1 \
file://register-all-OPPs.diff;patch=1 \
+ file://fix-audio-capture.patch;patch=1 \
"