summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wavelan_cs.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-06-28 06:46:46 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-06-28 06:46:46 +0200
commit2179a59db18ddf8eb3fd0133a3bee57f1c2b5b06 (patch)
tree575f59b6a0918b11f7c763aecf0c3e70478460d2 /drivers/net/wireless/wavelan_cs.c
parent[PATCH] wireless-device-attr-fixes-2 (diff)
parent[PATCH] cfq build fix (diff)
downloadlinux-2179a59db18ddf8eb3fd0133a3bee57f1c2b5b06.tar.xz
linux-2179a59db18ddf8eb3fd0133a3bee57f1c2b5b06.zip
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/net/wireless/wavelan_cs.c')
-rw-r--r--drivers/net/wireless/wavelan_cs.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index ec8329788e49..89532fd92941 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -4889,6 +4889,15 @@ wavelan_event(event_t event, /* The event received */
return 0;
}
+static struct pcmcia_device_id wavelan_ids[] = {
+ PCMCIA_DEVICE_PROD_ID12("AT&T","WaveLAN/PCMCIA", 0xe7c5affd, 0x1bc50975),
+ PCMCIA_DEVICE_PROD_ID12("Digital", "RoamAbout/DS", 0x9999ab35, 0x00d05e06),
+ PCMCIA_DEVICE_PROD_ID12("Lucent Technologies", "WaveLAN/PCMCIA", 0x23eb9949, 0x1bc50975),
+ PCMCIA_DEVICE_PROD_ID12("NCR", "WaveLAN/PCMCIA", 0x24358cd4, 0x1bc50975),
+ PCMCIA_DEVICE_NULL,
+};
+MODULE_DEVICE_TABLE(pcmcia, wavelan_ids);
+
static struct pcmcia_driver wavelan_driver = {
.owner = THIS_MODULE,
.drv = {
@@ -4896,6 +4905,7 @@ static struct pcmcia_driver wavelan_driver = {
},
.attach = wavelan_attach,
.detach = wavelan_detach,
+ .id_table = wavelan_ids,
};
static int __init