From: nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>
Date: Fri, 7 Jan 2005 23:40:08 +0000 (+0000)
Subject: Merge bk://oe-devel.bkbits.net/openembedded
X-Git-Tag: Release-2010-05/1~15444
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=193576667aa2a73adc519a888215a2909a65c89f;p=openembedded.git

Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/07 23:10:23+00:00 rpsys.net!RP
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into tim.rpsys.net:/usr/tmp6/openembedded

2005/01/07 23:09:04+00:00 rpsys.net!RP
openzaurus-2.6: updates to corgi and move collie to new scoop driver

BKrev: 41df1dd8QJfESq8By-iIsznf3XzLhA
---

diff --git a/packages/linux/openzaurus_2.6.10.bb b/packages/linux/openzaurus_2.6.10.bb
index dd0028745a..9c0dc74ae2 100644
--- a/packages/linux/openzaurus_2.6.10.bb
+++ b/packages/linux/openzaurus_2.6.10.bb
@@ -23,17 +23,17 @@ http://www.rpsys.net/openzaurus/${KV}/jl1/sharp_mtd.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/jl1/collie_use_sharp_mtd.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/jl1/poodle_base.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/jl1/poodle_fb.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/corgi_base-r7.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/corgi_base-r8.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/corgi_ssp-r4.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/w100-r10.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/w100-r14.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/mtd_sharpsl-r1.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/mtd_sharpsl_extra-r2.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/mtd_sharpsl_extra-r3.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/jffs2_longfilename-r0.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/mtd_sharpsl_map-r1.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/corgi_kbd-r4.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/corgi_backlight-r6.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/corgi_param-r1.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/corgi_ts-r2.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/corgi_ts-r3.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/corgi_power-r3.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/corgi_power1-r0.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/fb_blank-r0.patch;patch=1 \
@@ -42,6 +42,8 @@ http://www.rpsys.net/openzaurus/${KV}/sharpsl_pcmcia-r0.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/ide_fixes-r0.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/arm_scoop-r0.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/class_backlight-r0.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/collie_scoop-r0.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/collie_scoop_pcmcia-r0.patch;patch=1 \
 file://defconfig-husky \
 file://defconfig-collie \
 file://defconfig-poodle "