diff options
author | Koen Kooi <koen@openembedded.org> | 2006-09-26 13:47:00 +0000 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2006-09-26 13:47:00 +0000 |
commit | 97b2a9ed72620b72f6325ad305db03e72b9d399d (patch) | |
tree | 583b73e4335b128ec929a065c9a62710d4433146 /packages/linux/linux-openzaurus_2.6.17+git.bb | |
parent | 9f05350074121aeb9ce283ebecf8d91e9ff2546e (diff) | |
parent | fbef170546c9d0c31ea1a9977666fe34617cd4e8 (diff) |
merge of '300063bb2f3d1abb7a7532b48c45894ec6098d31'
and '60a1e8380dd7fc43fb994db1a4b4071e1a95b60b'
Diffstat (limited to 'packages/linux/linux-openzaurus_2.6.17+git.bb')
-rw-r--r-- | packages/linux/linux-openzaurus_2.6.17+git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/linux/linux-openzaurus_2.6.17+git.bb b/packages/linux/linux-openzaurus_2.6.17+git.bb index 97bb0234b2..e379aa1534 100644 --- a/packages/linux/linux-openzaurus_2.6.17+git.bb +++ b/packages/linux/linux-openzaurus_2.6.17+git.bb @@ -42,7 +42,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git; ${RPSRC}/poodle_audio-r1.patch;patch=1 \ ${RPSRC}/nand_sharpsl_fix-r0.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 \ |