From 99f1f609af5e0d629fe5a4ac154e5ed1acb8ac92 Mon Sep 17 00:00:00 2001
From: "nslu2-linux.adm@bkbits.net" <nslu2-linux.adm@bkbits.net>
Date: Thu, 20 Jan 2005 00:40:13 +0000
Subject: Merge bk://oe-devel.bkbits.net/openembedded into
 bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/20 00:38:04+00:00 rpsys.net!RP
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into tim.rpsys.net:/usr/tmp6/openembedded

2005/01/20 00:37:19+00:00 rpsys.net!RP
openazurus-2.6: move to bk7, removed merged patches. Update power and touchscreen code a bit. Add USB support.

BKrev: 41eefdedV9ZR9p70EEB2pexk39Tpgg
---
 packages/linux/openzaurus-2.6.11-rc1/defconfig-husky       |  3 ++-
 .../openzaurus-2.6.11-rc1/defconfig-openzaurus-pxa-2.6     |  3 ++-
 packages/linux/openzaurus_2.6.11-rc1.bb                    | 14 ++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'packages/linux')

diff --git a/packages/linux/openzaurus-2.6.11-rc1/defconfig-husky b/packages/linux/openzaurus-2.6.11-rc1/defconfig-husky
index 7466a6d34a..0baeebec48 100644
--- a/packages/linux/openzaurus-2.6.11-rc1/defconfig-husky
+++ b/packages/linux/openzaurus-2.6.11-rc1/defconfig-husky
@@ -865,7 +865,8 @@ CONFIG_USB_PXA2XX=y
 # CONFIG_USB_GADGET_OMAP is not set
 # CONFIG_USB_GADGET_DUALSPEED is not set
 # CONFIG_USB_ZERO is not set
-# CONFIG_USB_ETH is not set
+CONFIG_USB_ETH=y
+CONFIG_USB_ETH_RNDIS=n
 # CONFIG_USB_GADGETFS is not set
 # CONFIG_USB_FILE_STORAGE is not set
 # CONFIG_USB_G_SERIAL is not set
diff --git a/packages/linux/openzaurus-2.6.11-rc1/defconfig-openzaurus-pxa-2.6 b/packages/linux/openzaurus-2.6.11-rc1/defconfig-openzaurus-pxa-2.6
index 7466a6d34a..0baeebec48 100644
--- a/packages/linux/openzaurus-2.6.11-rc1/defconfig-openzaurus-pxa-2.6
+++ b/packages/linux/openzaurus-2.6.11-rc1/defconfig-openzaurus-pxa-2.6
@@ -865,7 +865,8 @@ CONFIG_USB_PXA2XX=y
 # CONFIG_USB_GADGET_OMAP is not set
 # CONFIG_USB_GADGET_DUALSPEED is not set
 # CONFIG_USB_ZERO is not set
-# CONFIG_USB_ETH is not set
+CONFIG_USB_ETH=y
+CONFIG_USB_ETH_RNDIS=n
 # CONFIG_USB_GADGETFS is not set
 # CONFIG_USB_FILE_STORAGE is not set
 # CONFIG_USB_G_SERIAL is not set
diff --git a/packages/linux/openzaurus_2.6.11-rc1.bb b/packages/linux/openzaurus_2.6.11-rc1.bb
index 83e929a130..96473c9f85 100644
--- a/packages/linux/openzaurus_2.6.11-rc1.bb
+++ b/packages/linux/openzaurus_2.6.11-rc1.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 = "r7"
+PR = "r8"
 
 # ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-${KV}.tar.gz \
 # http://www.cs.wisc.edu/~lenz/zaurus/
@@ -15,7 +15,7 @@ PR = "r7"
 #http://www.rpsys.net/openzaurus/${KV}/jl1/poodle_fb.patch;patch=1 \
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-${KV}.tar.gz \
-http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.11-rc1-bk4.gz;patch=1 \
+http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.11-rc1-bk7.gz;patch=1 \
            file://add-oz-release-string.patch;patch=1 \
            file://add-elpp-stuff.patch \
 http://www.rpsys.net/openzaurus/${KV}/jl1/pxa-linking-bug.patch;patch=1 \
@@ -32,14 +32,12 @@ http://www.rpsys.net/openzaurus/${KV}/jl1/collie_use_sharp_mtd.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 \
 http://www.rpsys.net/openzaurus/${KV}/corgi_ssp_extra-r0.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/corgi_fb-r1.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/corgi_mmc-r5.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/corgi_base_extras-r7.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/corgi_base_extras-r9.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/jffs2_longfilename-r0.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/corgi_kbd-r8.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/corgi_backlight-r10.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/corgi_ts-r3.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/corgi_power-r9.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/corgi_backlight-r11.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/corgi_ts-r4.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/corgi_power-r10.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/corgi_power1-r0.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/ide_fixes-r1.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/mmc_sd-r3.patch;patch=1 \
-- 
cgit v1.2.3