summaryrefslogtreecommitdiff
path: root/drivers/net/pcmcia
diff options
context:
space:
mode:
authorMarc Sowen <Marc.Sowen@ibeo-as.de>2006-06-25 08:56:24 (GMT)
committerDominik Brodowski <linux@dominikbrodowski.net>2006-06-30 20:09:13 (GMT)
commit6bb1c39a43d23e4cecc7e815491b6964c6758a29 (patch)
tree13966a7d705b4b02123201d28f3078bb3760dbe4 /drivers/net/pcmcia
parent0973ddddca72bc8aee8a273c232060b9608d1793 (diff)
downloadlinux-6bb1c39a43d23e4cecc7e815491b6964c6758a29.tar.xz
[PATCH] com20020_cs: more device support
Enable the com20020_cs arcnet driver to see the SoHard (now Mercury Computer Systems Inc.) SH ARC-PCMCIA card. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/net/pcmcia')
-rw-r--r--drivers/net/pcmcia/com20020_cs.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/pcmcia/com20020_cs.c b/drivers/net/pcmcia/com20020_cs.c
index 441de82..48434d79 100644
--- a/drivers/net/pcmcia/com20020_cs.c
+++ b/drivers/net/pcmcia/com20020_cs.c
@@ -387,7 +387,10 @@ static int com20020_resume(struct pcmcia_device *link)
}
static struct pcmcia_device_id com20020_ids[] = {
- PCMCIA_DEVICE_PROD_ID12("Contemporary Control Systems, Inc.", "PCM20 Arcnet Adapter", 0x59991666, 0x95dfffaf),
+ PCMCIA_DEVICE_PROD_ID12("Contemporary Control Systems, Inc.",
+ "PCM20 Arcnet Adapter", 0x59991666, 0x95dfffaf),
+ PCMCIA_DEVICE_PROD_ID12("SoHard AG",
+ "SH ARC PCMCIA", 0xf8991729, 0x69dff0c7),
PCMCIA_DEVICE_NULL
};
MODULE_DEVICE_TABLE(pcmcia, com20020_ids);