aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/airo_cs.c
diff options
context:
space:
mode:
authorGreg KH <greg@press.(none)>2005-06-27 22:07:56 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2005-06-27 22:07:56 -0700
commit8644d2a42bdba2d513f71c07eaf1b6f9b718b8eb (patch)
treec43b6c2fdf1b68b66906a2de69446dcec0f9af6b /drivers/net/wireless/airo_cs.c
parent1cde8a16815bd85c8137d1ea556398983c597c11 (diff)
parent99f95e5286df2f69edab8a04c7080d986ee4233b (diff)
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/wireless/airo_cs.c')
-rw-r--r--drivers/net/wireless/airo_cs.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c
index fbf53af6cda..f10a9523034 100644
--- a/drivers/net/wireless/airo_cs.c
+++ b/drivers/net/wireless/airo_cs.c
@@ -559,6 +559,15 @@ static int airo_event(event_t event, int priority,
return 0;
} /* airo_event */
+static struct pcmcia_device_id airo_ids[] = {
+ PCMCIA_DEVICE_MANF_CARD(0x015f, 0x000a),
+ PCMCIA_DEVICE_MANF_CARD(0x015f, 0x0005),
+ PCMCIA_DEVICE_MANF_CARD(0x015f, 0x0007),
+ PCMCIA_DEVICE_MANF_CARD(0x0105, 0x0007),
+ PCMCIA_DEVICE_NULL,
+};
+MODULE_DEVICE_TABLE(pcmcia, airo_ids);
+
static struct pcmcia_driver airo_driver = {
.owner = THIS_MODULE,
.drv = {
@@ -566,6 +575,7 @@ static struct pcmcia_driver airo_driver = {
},
.attach = airo_attach,
.detach = airo_detach,
+ .id_table = airo_ids,
};
static int airo_cs_init(void)