summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2006-09-26 08:32:01 +0000
committerRichard Purdie <rpurdie@rpsys.net>2006-09-26 08:32:01 +0000
commit38497be873296b8ff53f0ea46898b1fd6ba0b0f9 (patch)
treee2cbf3aa0ac1081f00b7b51a92e7070aab723ce8
parentefb4cd88349694b58003d7aca1da5394f4bfe38a (diff)
parent872ba8437eff950789563e5924c106add1f35116 (diff)
merge of '2a36f6aaa2eeb730787d5a6b1803b12efde31e44'
and 'ac475b9b4ff42b4a425ffca33a813dd7f3d095b6'
-rw-r--r--packages/linux/linux-openzaurus_2.6.18.bb8
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/linux/linux-openzaurus_2.6.18.bb b/packages/linux/linux-openzaurus_2.6.18.bb
index 88fbd0725d..9734111676 100644
--- a/packages/linux/linux-openzaurus_2.6.18.bb
+++ b/packages/linux/linux-openzaurus_2.6.18.bb
@@ -1,6 +1,6 @@
require linux-openzaurus.inc
-PR = "r3"
+PR = "r4"
# Handy URLs
# git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
@@ -13,8 +13,9 @@ PR = "r3"
# Patches submitted upstream are towards top of this list
# Hacks should clearly named and at the bottom
SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
- ${RPSRC}/alsa/asoc-v0.11.5.patch;patch=1 \
+ ${RPSRC}/alsa/asoc-v0.11.7.patch;patch=1 \
${RPSRC}/asoc_makefile-r1.patch;patch=1 \
+ ${RPSRC}/poodle_audio-r6.patch;patch=1 \
${RPSRC}/hx2750_base-r27.patch;patch=1 \
${RPSRC}/hx2750_bl-r7.patch;patch=1 \
${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \
@@ -32,10 +33,9 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
${RPSRC}/locomo_kbd_tweak-r1.patch;patch=1 \
${RPSRC}/poodle_pm-r3.patch;patch=1 \
${RPSRC}/pxafb_changeres-r2.patch;patch=1 \
- ${RPSRC}/poodle_audio-r5.patch;patch=1 \
${RPSRC}/pxa27x_overlay-r2.patch;patch=1 \
file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
- file://hrw-pcmcia-ids-r4.patch;patch=1 \
+ file://hrw-pcmcia-ids-r5.patch;patch=1 \
${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \
${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \