diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-28 09:12:38 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-28 09:12:38 -0500 |
| commit | 05ba712d7eb156009753e18e5116cabd869cc6e2 (patch) | |
| tree | 1ad850d6889f6b3671a5636653940f20a7d22bdf /drivers/net/pcmcia | |
| parent | 257ddbdad13cd3c4f7d03b85af632c508aa8abc9 (diff) | |
| parent | b473946a0853860e13b51c28add5524741117786 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/pcmcia')
| -rw-r--r-- | drivers/net/pcmcia/fmvj18x_cs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c index 813aca3fc433..7b17404d0858 100644 --- a/drivers/net/pcmcia/fmvj18x_cs.c +++ b/drivers/net/pcmcia/fmvj18x_cs.c | |||
| @@ -717,6 +717,7 @@ static struct pcmcia_device_id fmvj18x_ids[] = { | |||
| 717 | PCMCIA_PFC_DEVICE_PROD_ID12(0, "NEC", "PK-UG-J001" ,0x18df0ba0 ,0x831b1064), | 717 | PCMCIA_PFC_DEVICE_PROD_ID12(0, "NEC", "PK-UG-J001" ,0x18df0ba0 ,0x831b1064), |
| 718 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0105, 0x0d0a), | 718 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0105, 0x0d0a), |
| 719 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0105, 0x0e0a), | 719 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0105, 0x0e0a), |
| 720 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0032, 0x0e01), | ||
| 720 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0032, 0x0a05), | 721 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0032, 0x0a05), |
| 721 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0032, 0x1101), | 722 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0032, 0x1101), |
| 722 | PCMCIA_DEVICE_NULL, | 723 | PCMCIA_DEVICE_NULL, |