summaryrefslogtreecommitdiff
path: root/packages/linux/linux-rp_2.6.18.bb
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2006-12-06 05:26:06 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2006-12-06 05:26:06 +0000
commitb656cb140ef2f81d27cb918e8e710d1c23f5fce1 (patch)
tree530909c2e38279679fac1a1b5c8632acd2718d03 /packages/linux/linux-rp_2.6.18.bb
parentb80bc48ff72da3c7c0bb815e5e2b2addc08fb856 (diff)
parent52da0bdfcaf5c8d01ef59f49eb31d85bfb072cb2 (diff)
merge of '2101b73565978b4649020463f30341ac8c93a87f'
and '2f75c5628e4c39a771f757859494a9a7ed71f6e3'
Diffstat (limited to 'packages/linux/linux-rp_2.6.18.bb')
-rw-r--r--packages/linux/linux-rp_2.6.18.bb13
1 files changed, 7 insertions, 6 deletions
diff --git a/packages/linux/linux-rp_2.6.18.bb b/packages/linux/linux-rp_2.6.18.bb
index 3307bf60e8..aaecc90bb0 100644
--- a/packages/linux/linux-rp_2.6.18.bb
+++ b/packages/linux/linux-rp_2.6.18.bb
@@ -1,6 +1,6 @@
require linux-rp.inc
-PR = "r5"
+PR = "r6"
# Handy URLs
# git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
@@ -13,7 +13,7 @@ PR = "r5"
# 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.12.patch;patch=1 \
+ ${RPSRC}/alsa/asoc-v0.12.4.patch;patch=1 \
${RPSRC}/asoc_makefile-r1.patch;patch=1 \
${RPSRC}/poodle_audio-r6.patch;patch=1 \
${RPSRC}/hx2750_base-r27.patch;patch=1 \
@@ -34,6 +34,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
${RPSRC}/poodle_pm-r3.patch;patch=1 \
${RPSRC}/pxafb_changeres-r2.patch;patch=1 \
${RPSRC}/pxa27x_overlay-r2.patch;patch=1 \
+ ${RPSRC}/w100_extaccel-r0.patch;patch=1 \
file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
file://hrw-pcmcia-ids-r5.patch;patch=1 \
${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
@@ -84,21 +85,21 @@ SRC_URI_append_tosa = "\
${CHSRC}/usb-ohci-hooks-r1.patch;patch=1 \
${CHSRC}/tmio-core-r4.patch;patch=1 \
file://tmio-tc6393-r7.patch;patch=1 \
- file://tmio-nand-r6.patch;patch=1 \
+ file://tmio-nand-r7.patch;patch=1 \
file://tmio-ohci-r5.patch;patch=1 \
${CHSRC}/tmio-fb-r6.patch;patch=1 \
${DOSRC}/tosa-keyboard-r17.patch;patch=1 \
${DOSRC}/tosa-pxaac97-r6.patch;patch=1 \
${DOSRC}/tosa-tmio-r6.patch;patch=1 \
${DOSRC}/tosa-power-r17.patch;patch=1 \
- file://tosa-tmio-lcd-r9.patch;patch=1 \
+ file://tosa-tmio-lcd-r10.patch;patch=1 \
${DOSRC}/tosa-bluetooth-r8.patch;patch=1 \
${DOSRC}/wm97xx-lg7-r0.patch;patch=1 \
- ${DOSRC}/wm9712-suspend-cold-res-r1.patch;patch=1 \
+ file://wm9712-suspend-cold-res-r2.patch;patch=1 \
${DOSRC}/sharpsl-pm-postresume-r0.patch;patch=1 \
${DOSRC}/wm97xx-dig-restore-r0.patch;patch=1 \
${DOSRC}/wm97xx-miscdevs-resume-r0.patch;patch=1 \
- ${DOSRC}/wm9712-reset-loop-r1.patch;patch=1 \
+ file://wm9712-reset-loop-r2.patch;patch=1 \
file://tosa-lcdnoise-r1.patch;patch=1 \
file://wm97xx-lcdnoise-r0.patch;patch=1 "
# ${DOSRC}/tosa-asoc-r1.patch;patch=1 "