diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-28 06:12:38 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-28 06:12:38 -0800 |
| commit | 05ba712d7eb156009753e18e5116cabd869cc6e2 (patch) | |
| tree | 1ad850d6889f6b3671a5636653940f20a7d22bdf /drivers/serial/serial_cs.c | |
| parent | 257ddbdad13cd3c4f7d03b85af632c508aa8abc9 (diff) | |
| parent | b473946a0853860e13b51c28add5524741117786 (diff) | |
| download | blackbird-op-linux-05ba712d7eb156009753e18e5116cabd869cc6e2.tar.gz blackbird-op-linux-05ba712d7eb156009753e18e5116cabd869cc6e2.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/serial/serial_cs.c')
| -rw-r--r-- | drivers/serial/serial_cs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c index df854401af2d..95421fa3b304 100644 --- a/drivers/serial/serial_cs.c +++ b/drivers/serial/serial_cs.c @@ -758,6 +758,7 @@ static struct pcmcia_device_id serial_ids[] = { PCMCIA_PFC_DEVICE_PROD_ID12(1, "PCMCIAs", "LanModem", 0xdcfe12d3, 0xc67c648f), PCMCIA_PFC_DEVICE_PROD_ID12(1, "TDK", "GlobalNetworker 3410/3412", 0x1eae9475, 0xd9a93bed), PCMCIA_PFC_DEVICE_PROD_ID12(1, "Xircom", "CreditCard Ethernet+Modem II", 0x2e3ee845, 0xeca401bf), + PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0032, 0x0e01), PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0032, 0x0a05), PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0032, 0x1101), PCMCIA_MFC_DEVICE_MANF_CARD(0, 0x0104, 0x0070), |
