From: Richard Purdie <rpurdie@rpsys.net>
Date: Sat, 5 Mar 2005 23:39:03 +0000 (+0000)
Subject: Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
X-Git-Tag: Release-2010-05/1~14752
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b692b2c25df5b073d8747cd44800133957def797;p=openembedded.git

Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into tim.rpsys.net:/usr/oe/openembedded

2005/03/05 23:38:41+00:00 rpsys.net!RP
openzaurus-2.6: Updates to w100fb driver

BKrev: 422a4317vcViZHO9m4XXFQpEqEQxag
---

diff --git a/packages/linux/linux-openzaurus_2.6.11.bb b/packages/linux/linux-openzaurus_2.6.11.bb
index 90943565fe..654fc4c2a8 100644
--- a/packages/linux/linux-openzaurus_2.6.11.bb
+++ b/packages/linux/linux-openzaurus_2.6.11.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 KV = "${@bb.data.getVar('PV',d,True)}"
 
-PR = "r1"
+PR = "r2"
 
 DOSRC="http://www.do13.in-berlin.de/openzaurus"
 RPSRC="http://www.rpsys.net/openzaurus/patches"
@@ -39,12 +39,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \
            ${RPSRC}/mmc_sd-r4.patch;patch=1 \
            ${RPSRC}/corgi_snd-r4.patch;patch=1 \
            ${RPSRC}/sharpsl_param-r2.patch;patch=1 \
-           ${RPSRC}/w100_split-r0.patch;patch=1 \
-           ${RPSRC}/w100_split1-r0.patch;patch=1 \
-           ${RPSRC}/w100_split2-r0.patch;patch=1 \
-           ${RPSRC}/w100_split3-r0.patch;patch=1 \
-           ${RPSRC}/w100_split4-r0.patch;patch=1 \
-           ${RPSRC}/w100_split5-r0.patch;patch=1 \
+           ${RPSRC}/w100_split-r2.patch;patch=1 \
            ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \
            ${JLSRC}/zaurus-leds-2.6.11.diff.gz;patch=1 \
            ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 \