diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-03 22:55:21 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-03 22:55:21 +0000 |
| commit | 04228460a3ded723b2da09141c76c45ddd712caf (patch) | |
| tree | db7b9143b150ead1e9fec10760a1d5ff4045a5e7 /drivers/net/pcmcia/axnet_cs.c | |
| parent | 7c0ab43e6ab09d72dc8dbac2521b2f819ccc4026 (diff) | |
| parent | 24c78557741395e038e83f25367cf2bfd7f582b8 (diff) | |
| download | talos-op-linux-04228460a3ded723b2da09141c76c45ddd712caf.tar.gz talos-op-linux-04228460a3ded723b2da09141c76c45ddd712caf.zip | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'drivers/net/pcmcia/axnet_cs.c')
| -rw-r--r-- | drivers/net/pcmcia/axnet_cs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index 8a4d19e5de06..f1047dd8a526 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c @@ -690,6 +690,7 @@ static void block_output(struct net_device *dev, int count, static struct pcmcia_device_id axnet_ids[] = { PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x016c, 0x0081), PCMCIA_DEVICE_MANF_CARD(0x018a, 0x0301), + PCMCIA_DEVICE_MANF_CARD(0x01bf, 0x2328), PCMCIA_DEVICE_MANF_CARD(0x026f, 0x0301), PCMCIA_DEVICE_MANF_CARD(0x026f, 0x0303), PCMCIA_DEVICE_MANF_CARD(0x026f, 0x0309), |
