projects
/
platform
/
kernel
/
kernel-mfld-blackbay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ea8ee24
)
hostap_cs: add ID for Conceptronic CON11CPro
author
Pavel Roskin
<proski@gnu.org>
Fri, 16 May 2008 21:52:57 +0000
(17:52 -0400)
committer
John W. Linville
<linville@tuxdriver.com>
Tue, 20 May 2008 21:55:30 +0000
(17:55 -0400)
Reported by Santiago Garcia Mantinan <hostap@manty.net>
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/hostap/hostap_cs.c
patch
|
blob
|
history
diff --git
a/drivers/net/wireless/hostap/hostap_cs.c
b/drivers/net/wireless/hostap/hostap_cs.c
index
437a9bc
..
ed4317a
100644
(file)
--- a/
drivers/net/wireless/hostap/hostap_cs.c
+++ b/
drivers/net/wireless/hostap/hostap_cs.c
@@
-833,6
+833,7
@@
static struct pcmcia_device_id hostap_cs_ids[] = {
PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x0001),
PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300),
/* PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000), conflict with pcnet_cs */
+ PCMCIA_DEVICE_MANF_CARD(0xc250, 0x0002),
PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002),
PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005),
PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010),