projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0973ddd
)
[PATCH] com20020_cs: more device support
author
Marc Sowen
<Marc.Sowen@ibeo-as.de>
Sun, 25 Jun 2006 08:56:24 +0000
(
01:56
-0700)
committer
Dominik Brodowski
<linux@dominikbrodowski.net>
Fri, 30 Jun 2006 20:09:13 +0000
(22:09 +0200)
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>
drivers/net/pcmcia/com20020_cs.c
patch
|
blob
|
history
diff --git
a/drivers/net/pcmcia/com20020_cs.c
b/drivers/net/pcmcia/com20020_cs.c
index
441de82
..
48434d7
100644
(file)
--- 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);