lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge /spare/repo/netdev-2.6 branch 'ieee80211'

Browse Source
This commit is contained in:
Jeff Garzik
2005-06-28 00:46:58 -04:00
parent 30b4d6565e 2179a59db1
commit d011e151bc
101 changed files with 5489 additions and 2809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/wireless/wl3501_cs.c
View File

@ -2240,6 +2240,12 @@ static int wl3501_event(event_t event, int pri, event_callback_args_t *args)
return 0;
}
static struct pcmcia_device_id wl3501_ids[] = {
PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0001),
PCMCIA_DEVICE_NULL
};
MODULE_DEVICE_TABLE(pcmcia, wl3501_ids);
static struct pcmcia_driver wl3501_driver = {
.owner = THIS_MODULE,
.drv = {
@ -2247,6 +2253,7 @@ static struct pcmcia_driver wl3501_driver = {
},
.attach = wl3501_attach,
.detach = wl3501_detach,
.id_table = wl3501_ids,
};
static int __init wl3501_init_module(void)