diff options
author | Richard Purdie <richard@openedhand.com> | 2006-07-07 08:24:47 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-07-07 08:24:47 +0000 |
commit | dd126d2256e1835e17037aab7cc15cfc79ebd113 (patch) | |
tree | 794654193b78432d256db8e33c0db3567fa8838f | |
parent | f069fc71009d61f20a683beffa371fdbf02a002b (diff) | |
download | poky-dd126d2256e1835e17037aab7cc15cfc79ebd113.tar.gz |
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.patch | 27 | ||||
-rw-r--r-- | openembedded/packages/linux/linux-openzaurus_2.6.17.bb | 2 |
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 0000000000..2e1966e837 --- /dev/null +++ b/openembedded/packages/linux/linux-openzaurus-2.6.16/10-pcnet.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | |||
2 | From: Marcin Juszkiewicz <openembedded@hrw.one.pl> | ||
3 | |||
4 | Add TRENDnet TE-CF100 ethernet adapter to pcnet_cs list. | ||
5 | |||
6 | product info: "Fast Ethernet", "CF Size PC Card", "1.0", "" | ||
7 | manfid: 0x0149, 0xc1ab | ||
8 | |||
9 | Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl> | ||
10 | |||
11 | drivers/net/pcmcia/pcnet_cs.c | 2 ++ | ||
12 | 1 file changed, 2 insertions(+) | ||
13 | |||
14 | Index: netdev-2.6/drivers/net/pcmcia/pcnet_cs.c | ||
15 | =================================================================== | ||
16 | --- netdev-2.6.orig/drivers/net/pcmcia/pcnet_cs.c 2006-05-18 11:06:43.294022480 +0200 | ||
17 | +++ netdev-2.6/drivers/net/pcmcia/pcnet_cs.c 2006-05-18 11:10:31.548322552 +0200 | ||
18 | @@ -1768,6 +1768,8 @@ | ||
19 | PCMCIA_DEVICE_CIS_PROD_ID12("NDC", "Ethernet", 0x01c43ae1, 0x00b2e941, "NE2K.cis"), | ||
20 | PCMCIA_DEVICE_CIS_PROD_ID12("PMX ", "PE-200", 0x34f3f1c8, 0x10b59f8c, "PE-200.cis"), | ||
21 | PCMCIA_DEVICE_CIS_PROD_ID12("TAMARACK", "Ethernet", 0xcf434fba, 0x00b2e941, "tamarack.cis"), | ||
22 | + PCMCIA_DEVICE_PROD_ID123("Fast Ethernet", "CF Size PC Card", "1.0", | ||
23 | + 0xb4be14e3, 0x43ac239b, 0x0877b627), | ||
24 | PCMCIA_DEVICE_NULL | ||
25 | }; | ||
26 | MODULE_DEVICE_TABLE(pcmcia, pcnet_ids); | ||
27 | |||
diff --git a/openembedded/packages/linux/linux-openzaurus_2.6.17.bb b/openembedded/packages/linux/linux-openzaurus_2.6.17.bb index 2a34a6614d..b5380a91bd 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 | |||
2 | 2 | ||
3 | PR = "r5" | 3 | PR = "r5" |
4 | 4 | ||
5 | DEFAULT_PREFERENCE = "-1" | ||
6 | |||
7 | # Handy URLs | 5 | # Handy URLs |
8 | # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ | 6 | # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ |
9 | # http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.14.tar.gz \ | 7 | # http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.14.tar.gz \ |