diff options
| author | Koen Kooi <koen@openembedded.org> | 2006-03-02 17:54:35 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-03-02 17:54:35 +0000 |
| commit | 40ce95ca64d662c16cec3d1efabc966dda5a2610 (patch) | |
| tree | c5687492fbbc7f7e46b8db8448b1da640fef9955 /packages/linux/linux-openzaurus_2.6.15.bb | |
| parent | 858ca7bc53e7c03eac036217486e87e36eb1e3e6 (diff) | |
| parent | 966f3a94af2c83ffd2c634171fbe04917731b6f9 (diff) | |
explicit_merge of '601faaded8a6427e29dc8dc43433fe9be662c96c'
and 'a67386ccbaf4538441ab5d8769e018207ab0c744'
using ancestor '9c1b32d8825be71ddfdcbe3ddfa31b4cc8bb2aa0'
to branch 'org.openembedded.dev'
Diffstat (limited to 'packages/linux/linux-openzaurus_2.6.15.bb')
| -rw-r--r-- | packages/linux/linux-openzaurus_2.6.15.bb | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/packages/linux/linux-openzaurus_2.6.15.bb b/packages/linux/linux-openzaurus_2.6.15.bb index cfd02bb25c..360bce4d87 100644 --- a/packages/linux/linux-openzaurus_2.6.15.bb +++ b/packages/linux/linux-openzaurus_2.6.15.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r6" +PR = "r10" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ @@ -64,16 +64,18 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \ ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \ ${RPSRC}/usb_pxa27x_udc-r0.patch;patch=1 \ ${RPSRC}/usb_add_epalloc-r1.patch;patch=1 \ - ${RPSRC}/alsa/alsa-soc-0.9.patch;patch=1 \ - ${RPSRC}/alsa/alsa-soc-0.9-0.10rc1.patch;patch=1 \ - ${RPSRC}/alsa_soc_rpupdate7-r2.patch;patch=1 \ - ${RPSRC}/alsa_akita_fix-r0.patch;patch=1 \ + ${RPSRC}/alsa/asoc-0.10rc2.diff.bz2;patch=1 \ + ${RPSRC}/alsa/asoc-v0.10rc2-rc3.patch;patch=1 \ + ${RPSRC}/misc_fix1-r0.patch;patch=1 \ ${RPSRC}/zaurus_keyboard_tweak-r0.patch;patch=1 \ ${RPSRC}/corgi_bl_cleanup-r2.patch;patch=1 \ ${RPSRC}/corgi_bl_generic-r2.patch;patch=1 \ ${RPSRC}/pxafb_tweaks-r0.patch;patch=1 \ ${RPSRC}/pm_changes-r0.patch;patch=1 \ ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1 \ + ${RPSRC}/headphone_switch-r3.patch;patch=1 \ + ${RPSRC}/backport_i2c_asoc_fix-r0.patch;patch=1 \ + ${RPSRC}/integrator_rtc-r0.patch;patch=1 \ ${DOSRC}/kexec-arm-r0.patch;patch=1 \ file://add-oz-release-string.patch;patch=1 \ file://pxa-serial-hack.patch;patch=1 \ @@ -86,6 +88,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \ file://defconfig-collie \ file://defconfig-poodle \ file://defconfig-cxx00 \ + file://defconfig-qemuarm \ file://defconfig-tosa " # Disabled until I find the reason this gives issues with cdc_subset |