diff options
| author |   Koen Kooi <koen@openembedded.org> | 2005-06-21 11:34:43 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2005-06-21 11:34:43 +0000 |
| commit | ef2be274ad24b77b87c47ba1b1b612c9e41fb643 (patch) | |
| tree | a5a2813be17b7e8ac3b49f17e5a22fe7ef0cafe7 /packages/linux | |
| parent | 3eb95a70cc38dc0a9ad6e0a49c9fe31bcf47a309 (diff) | |
| download | openembedded-ef2be274ad24b77b87c47ba1b1b612c9e41fb643.tar.gz | |
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into dominion.dominion.void:/data/build/oe/openembedded
2005/06/21 12:20:14+01:00 rpsys.net!RP
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into tim.rpsys.net:/usr/oe/openembedded
2005/06/21 12:19:45+01:00 rpsys.net!RP
linux-oz-2.6: Add rmk's armsmp fix, fix collie typo, revise corgi_ts pmu patch for upstream, revise corgi_kbd suspend key handling - should fix all known suspend/resume button problems :)
BKrev: 42b7fb53_4JnWdcwa3fNQXngoY_E9w
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/linux-openzaurus_2.6.12-rc6-mm1.bb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/packages/linux/linux-openzaurus_2.6.12-rc6-mm1.bb b/packages/linux/linux-openzaurus_2.6.12-rc6-mm1.bb index e406d7d4f3..1a82ddb0cd 100644 --- a/packages/linux/linux-openzaurus_2.6.12-rc6-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.12-rc6-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r3" +PR = "r4" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -20,17 +20,21 @@ BASRC = "http://www.orca.cx/zaurus/patches" # ${RPSRC}/corgi_kbd1-r1.patch;patch=1 \ # ${RPSRC}/sharpsl_mapprom-r1.patch;patch=1 \ +# ${RPSRC}/mmtree_revert_armsmp-r0.patch;patch=1 \ # Patches submitted upstream are towards top of this list SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \ ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.12-rc6.bz2;patch=1 \ ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc6/2.6.12-rc6-mm1/2.6.12-rc6-mm1.bz2;patch=1 \ ${RPSRC}/machtype_update-r1.patch;patch=1 \ - ${RPSRC}/mmtree_revert_armsmp-r0.patch;patch=1 \ + ${RPSRC}/collie_typofix-r0.patch;patch=1 \ + ${RPSRC}/rmk_armsmp_fix-r0.patch;patch=1 \ + ${RPSRC}/corgi_tspmu-r1.patch;patch=1 \ ${RPSRC}/oprofile_trace-r3.patch;patch=1 \ ${RPSRC}/preempt_nwfpe-r0.patch;patch=1 \ ${RPSRC}/copypagefix-r1.patch;patch=1 \ ${RPSRC}/corgi_kbd3-r6.patch;patch=1 \ + ${RPSRC}/corgi_kbd_susres-r0.patch;patch=1 \ ${RPSRC}/pxa_rtc-r1.patch;patch=1 \ ${RPSRC}/pxa_irda-r2.patch;patch=1 \ ${RPSRC}/sharp_multi_pcmcia-r2.patch;patch=1 \ @@ -42,8 +46,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \ ${RPSRC}/corgi_power1-r1.patch;patch=1 \ ${RPSRC}/mmc_sd-r5.patch;patch=1 \ ${RPSRC}/corgi_snd-r6.patch;patch=1 \ - ${RPSRC}/w100_split-r10.patch;patch=1 \ - ${RPSRC}/corgi_tspmu-r0.patch;patch=1 \ + ${RPSRC}/w100_split-r11.patch;patch=1 \ ${RPSRC}/pxa_i2c-r2.patch;patch=1 \ ${DOSRC}/pxa-i2c-suspend-r0.patch;patch=1 \ ${DOSRC}/pxa-i2c-func-r0.patch;patch=1 \ |