summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-07-07 08:24:47 +0000
committerRichard Purdie <richard@openedhand.com>2006-07-07 08:24:47 +0000
commitdd126d2256e1835e17037aab7cc15cfc79ebd113 (patch)
tree794654193b78432d256db8e33c0db3567fa8838f
parentf069fc71009d61f20a683beffa371fdbf02a002b (diff)
downloadopenembedded-core-dd126d2256e1835e17037aab7cc15cfc79ebd113.tar.gz
openembedded-core-dd126d2256e1835e17037aab7cc15cfc79ebd113.tar.bz2
openembedded-core-dd126d2256e1835e17037aab7cc15cfc79ebd113.tar.xz
openembedded-core-dd126d2256e1835e17037aab7cc15cfc79ebd113.zip
linux-oz-2.6: Make 2.6.17 the default + add a missing 2.6.16 patch
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@510 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--openembedded/packages/linux/linux-openzaurus-2.6.16/10-pcnet.patch27
-rw-r--r--openembedded/packages/linux/linux-openzaurus_2.6.17.bb2
2 files changed, 27 insertions, 2 deletions
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.16/10-pcnet.patch b/openembedded/packages/linux/linux-openzaurus-2.6.16/10-pcnet.patch
new file mode 100644
index 000000000..2e1966e83
--- /dev/null
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.16/10-pcnet.patch
@@ -0,0 +1,27 @@
+
+From: Marcin Juszkiewicz <openembedded@hrw.one.pl>
+
+Add TRENDnet TE-CF100 ethernet adapter to pcnet_cs list.
+
+product info: "Fast Ethernet", "CF Size PC Card", "1.0", ""
+ manfid: 0x0149, 0xc1ab
+
+Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl>
+
+ drivers/net/pcmcia/pcnet_cs.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+Index: netdev-2.6/drivers/net/pcmcia/pcnet_cs.c
+===================================================================
+--- netdev-2.6.orig/drivers/net/pcmcia/pcnet_cs.c 2006-05-18 11:06:43.294022480 +0200
++++ netdev-2.6/drivers/net/pcmcia/pcnet_cs.c 2006-05-18 11:10:31.548322552 +0200
+@@ -1768,6 +1768,8 @@
+ PCMCIA_DEVICE_CIS_PROD_ID12("NDC", "Ethernet", 0x01c43ae1, 0x00b2e941, "NE2K.cis"),
+ PCMCIA_DEVICE_CIS_PROD_ID12("PMX ", "PE-200", 0x34f3f1c8, 0x10b59f8c, "PE-200.cis"),
+ PCMCIA_DEVICE_CIS_PROD_ID12("TAMARACK", "Ethernet", 0xcf434fba, 0x00b2e941, "tamarack.cis"),
++ PCMCIA_DEVICE_PROD_ID123("Fast Ethernet", "CF Size PC Card", "1.0",
++ 0xb4be14e3, 0x43ac239b, 0x0877b627),
+ PCMCIA_DEVICE_NULL
+ };
+ MODULE_DEVICE_TABLE(pcmcia, pcnet_ids);
+
diff --git a/openembedded/packages/linux/linux-openzaurus_2.6.17.bb b/openembedded/packages/linux/linux-openzaurus_2.6.17.bb
index 2a34a6614..b5380a91b 100644
--- a/openembedded/packages/linux/linux-openzaurus_2.6.17.bb
+++ b/openembedded/packages/linux/linux-openzaurus_2.6.17.bb
@@ -2,8 +2,6 @@ include linux-openzaurus.inc
PR = "r5"
-DEFAULT_PREFERENCE = "-1"
-
# Handy URLs
# git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
# http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.14.tar.gz \