diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-23 09:43:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-23 09:43:21 -0700 |
| commit | cb6aef2879b769644b35cffe9844c81c63809c8e (patch) | |
| tree | ccaab997f764e155226da1b600dabbe0b65f4ad7 /drivers/net/pcmcia/pcnet_cs.c | |
| parent | 950709a8961e2dde05bc55dca29b2d2e54a6d3ec (diff) | |
| parent | 48b950ff241fca03a6969a5eb6a42a02722678d4 (diff) | |
| download | blackbird-op-linux-cb6aef2879b769644b35cffe9844c81c63809c8e.tar.gz blackbird-op-linux-cb6aef2879b769644b35cffe9844c81c63809c8e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6:
[PATCH] pcmcia/pcmcia_resource.c: fix crash when using Cardbus cards
[PATCH] vrc4171: update config
[PATCH] pcmcia: fix oops in static mapping case
[PATCH] pcmcia: remove unneeded forward declarations
[PATCH] pcmcia: do not set dev_node to NULL too early
[PATCH] pcmcia: fix comment for pcmcia_load_firmware
[PATCH] pcmcia: unload second device first
[PATCH] pcmcia: add new ID to pcnet_cs
Diffstat (limited to 'drivers/net/pcmcia/pcnet_cs.c')
| -rw-r--r-- | drivers/net/pcmcia/pcnet_cs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c index 506e777c5f06..d090df413049 100644 --- a/drivers/net/pcmcia/pcnet_cs.c +++ b/drivers/net/pcmcia/pcnet_cs.c @@ -1639,6 +1639,7 @@ static struct pcmcia_device_id pcnet_ids[] = { PCMCIA_DEVICE_PROD_ID12("CONTEC", "C-NET(PC)C-10L", 0x21cab552, 0xf6f90722), PCMCIA_DEVICE_PROD_ID12("corega", "FEther PCC-TXF", 0x0a21501a, 0xa51564a2), PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega EtherII PCC-T", 0x5261440f, 0xfa9d85bd), + PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega EtherII PCC-TD", 0x5261440f, 0xc49bd73d), PCMCIA_DEVICE_PROD_ID12("Corega K.K.", "corega EtherII PCC-TD", 0xd4fdcbd8, 0xc49bd73d), PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega Ether PCC-T", 0x5261440f, 0x6705fcaa), PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega FastEther PCC-TX", 0x5261440f, 0x485e85d9), |
