summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2005-02-03 10:10:24 +0000
committerRichard Purdie <rpurdie@rpsys.net>2005-02-03 10:10:24 +0000
commit0f3b6ed3d3bc71e177233a7812b907398cfc5621 (patch)
tree673cf7ebfe1ef1cb5aac8f1acbe9792b99a91b56
parentf6f11469d96ff3bf7608d3ece77d078a7b31a34d (diff)
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into tim.rpsys.net:/usr/oe/openembedded 2005/02/03 10:09:59+00:00 rpsys.net!RP openzaurus-2.6: Add fix to allow USB Gadget Ethernet RNDIS to compile and add to defconfig files BKrev: 4201f8908gxCtV00kfVKy_ZtGNU1AA
-rw-r--r--packages/linux/openzaurus-2.6.11-rc2/defconfig-husky2
-rw-r--r--packages/linux/openzaurus-2.6.11-rc2/defconfig-openzaurus-pxa-2.62
-rw-r--r--packages/linux/openzaurus_2.6.11-rc2.bb3
3 files changed, 4 insertions, 3 deletions
diff --git a/packages/linux/openzaurus-2.6.11-rc2/defconfig-husky b/packages/linux/openzaurus-2.6.11-rc2/defconfig-husky
index f2656ed0dd..ead5f177bf 100644
--- a/packages/linux/openzaurus-2.6.11-rc2/defconfig-husky
+++ b/packages/linux/openzaurus-2.6.11-rc2/defconfig-husky
@@ -921,7 +921,7 @@ CONFIG_USB_PXA2XX_SMALL=y
# CONFIG_USB_GADGET_DUALSPEED is not set
# CONFIG_USB_ZERO is not set
CONFIG_USB_ETH=y
-# CONFIG_USB_ETH_RNDIS is not set
+CONFIG_USB_ETH_RNDIS=y
# 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-rc2/defconfig-openzaurus-pxa-2.6 b/packages/linux/openzaurus-2.6.11-rc2/defconfig-openzaurus-pxa-2.6
index f2656ed0dd..ead5f177bf 100644
--- a/packages/linux/openzaurus-2.6.11-rc2/defconfig-openzaurus-pxa-2.6
+++ b/packages/linux/openzaurus-2.6.11-rc2/defconfig-openzaurus-pxa-2.6
@@ -921,7 +921,7 @@ CONFIG_USB_PXA2XX_SMALL=y
# CONFIG_USB_GADGET_DUALSPEED is not set
# CONFIG_USB_ZERO is not set
CONFIG_USB_ETH=y
-# CONFIG_USB_ETH_RNDIS is not set
+CONFIG_USB_ETH_RNDIS=y
# 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-rc2.bb b/packages/linux/openzaurus_2.6.11-rc2.bb
index e3fbe1e140..9a47cae218 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 = "r10"
+PR = "r11"
# 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 \
@@ -47,6 +47,7 @@ http://www.rpsys.net/openzaurus/${KV}/mmc_sd-r3.patch;patch=1 \
http://www.rpsys.net/openzaurus/${KV}/w100_malloc-r1.patch;patch=1 \
http://www.rpsys.net/openzaurus/${KV}/input_power-r1.patch;patch=1 \
http://www.rpsys.net/openzaurus/${KV}/corgi_snd-r3.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/rndis_fix-r0.patch;patch=1 \
file://defconfig-husky \
file://defconfig-collie \
file://defconfig-poodle \