From: Richard Purdie <rpurdie@rpsys.net>
Date: Sat, 29 Jan 2005 10:21:11 +0000 (+0000)
Subject: Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
X-Git-Tag: Release-2010-05/1~15258
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=767ec7cc7896fa80979ed3ccab1169bb1358b689;p=openembedded.git

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

2005/01/29 10:20:45+00:00 rpsys.net!RP
openzaurus-2.6: Update keyboard driver so power control works

BKrev: 41fb6397Z_Jk0u9IA3Eqboqj6MvEYA
---

diff --git a/packages/linux/openzaurus_2.6.11-rc2.bb b/packages/linux/openzaurus_2.6.11-rc2.bb
index 88a69cac65..e7ba148b59 100644
--- a/packages/linux/openzaurus_2.6.11-rc2.bb
+++ b/packages/linux/openzaurus_2.6.11-rc2.bb
@@ -4,7 +4,7 @@ MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>, Michael 'Mickey' Lauer <mickey
 LICENSE = "GPL"
 #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 KV = "${@bb.data.getVar('PV',d,True)}"
-PR = "r5"
+PR = "r6"
 
 # ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-${KV}.tar.gz \
 # http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1 \
@@ -38,7 +38,7 @@ http://www.rpsys.net/openzaurus/${KV}/corgi_base_extras2-r0.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/corgi_base_extras3-r0.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/corgi_base_extras1-r0.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/jffs2_longfilename-r0.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/corgi_kbd-r12.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/corgi_kbd-r14.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/corgi_ts-r10.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/corgi_power-r15.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/corgi_power1-r0.patch;patch=1 \