diff options
author | Koen Kooi <koen@openembedded.org> | 2007-01-02 19:39:48 +0000 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2007-01-02 19:39:48 +0000 |
commit | 26923fcad450090e65e0fca74a0532fbea3ae458 (patch) | |
tree | ec1017dd159196314b0c49e2e4586a5eb4b148f9 /packages/linux | |
parent | 1c0f065147987103a23908fcdc954834df3dad5f (diff) | |
parent | 4cfc3d5ccd4cd3dc572958bdad127856be41cb2c (diff) |
merge of '2cb5af15b69e039f3a37629ca3a637b05cae7138'
and '8571d11847894fe4e419cfb25c5ae5accc13e3aa'
Diffstat (limited to 'packages/linux')
-rw-r--r-- | packages/linux/linux-rp_2.6.19+git.bb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/packages/linux/linux-rp_2.6.19+git.bb b/packages/linux/linux-rp_2.6.19+git.bb index 4620537aa1..3df216d616 100644 --- a/packages/linux/linux-rp_2.6.19+git.bb +++ b/packages/linux/linux-rp_2.6.19+git.bb @@ -15,9 +15,10 @@ DEFAULT_PREFERENCE = "-1" # Patches submitted upstream are towards top of this list # Hacks should clearly named and at the bottom SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=v2.6.20-rc2 \ - http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.12.4.patch;patch=1;status=merged \ + http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.13pre1.patch;patch=1;status=merged \ + ${RPSRC}/asoc_13pre1_fix-r0.patch;patch=1 \ ${RPSRC}/xscale_cache_workaround-r1.patch;patch=1;status=merged \ - ${RPSRC}/backlight_parameter_fix-r0.patch;patch=1;status=pending \ + ${RPSRC}/backlight_parameter_fix-r1.patch;patch=1;status=pending \ ${RPSRC}/hx2750_base-r28.patch;patch=1 \ ${RPSRC}/hx2750_bl-r8.patch;patch=1 \ ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \ @@ -31,7 +32,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git; ${RPSRC}/pm_changes-r1.patch;patch=1 \ ${RPSRC}/usb_add_epalloc-r3.patch;patch=1 \ ${RPSRC}/usb_pxa27x_udc-r3.patch;patch=1 \ - ${DOSRC}/kexec-arm-r4.patch;patch=1 \ + ${RPSRC}/kexec-arm-r4.patch;patch=1 \ ${RPSRC}/locomo_kbd_tweak-r1.patch;patch=1 \ ${RPSRC}/poodle_pm-r3.patch;patch=1 \ ${RPSRC}/pxa27x_overlay-r5.patch;patch=1 \ |