diff options
author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2008-01-16 14:34:35 +0000 |
---|---|---|
committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2008-01-16 14:34:35 +0000 |
commit | 8378be7a49b8cdb9935fdeb2594ddd00d89930e1 (patch) | |
tree | 664c351ca0f6076782bbae8445ef4ff333b81093 /packages/linux | |
parent | b530959e3ae9765a41527963c99072b5d4f468fc (diff) | |
parent | f0ee954dd96ad99345d8ac116a9fecf92920a9ae (diff) |
merge of 'b54b6efc8251bc5fce52afcb9a74272f2cea1bbb'
and 'fc51ba6c6f78e661b51a328e391e78d3fa49d2d0'
Diffstat (limited to 'packages/linux')
-rw-r--r-- | packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb b/packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb index 1194f71bb2..48211e54ca 100644 --- a/packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb +++ b/packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r3" +PR = "r4" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_collie = "1" @@ -86,13 +86,17 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \ # These patches are extracted from Pavel Machek's git tree # (diff against vanilla kernel) SRC_URI_append_collie = "\ - ${DOSRC}/collie/mtd-sharp-flash-hack-r0.patch;patch=1 \ - ${DOSRC}/collie/collie-r0.patch;patch=1 \ - ${DOSRC}/collie/locomolcd-backlight-r0.patch;patch=1 \ - ${DOSRC}/collie/ucb1x00-touch-audio-r0.patch;patch=1 \ - file://collie-mcp-r1.patch;patch=1 \ - ${DOSRC}/collie/sa1100-udc-r0.patch;patch=1 \ -# ${DOSRC}/collie/collie-pm-r1.patch;patch=1 \ + ${TKSRC}/${PN}_${PV}/mtd-sharp-flash-hack-r3.patch;patch=1 \ + ${TKSRC}/${PN}_${PV}/mcp-sa11x0-r0.patch;patch=1 \ + ${TKSRC}/${PN}_${PV}/locomo-r0.patch;patch=1 \ + ${TKSRC}/${PN}_${PV}/locomo_spi-4.patch;patch=1 \ + ${TKSRC}/${PN}_${PV}/collie-kexec.patch;patch=1 \ + ${TKSRC}/${PN}_${PV}/sharpsl_pm-2.patch;patch=1 \ + ${TKSRC}/${PN}_${PV}/collie_pm-2.patch;patch=1 \ + ${TKSRC}/${PN}_${PV}/locomokeyb_suspendkey-2.patch;patch=1 \ + ${TKSRC}/${PN}_${PV}/ucb1x00_suspend.patch;patch=1 \ + ${TKSRC}/${PN}_${PV}/collie-ts.patch;patch=1 \ + ${TKSRC}/${PN}_${PV}/pcmcia_suspend.patch;patch=1 \ " SRC_URI_append_tosa = "\ |