Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 3765
b: refs/heads/master
c: a58e26c
h: refs/heads/master
i:
  3763: e83b808
v: v3
  • Loading branch information
Dominik Brodowski authored and Linus Torvalds committed Jun 28, 2005
1 parent a73135d commit 58dc546
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5d402e95ebf8cc2fbf0e59e8424d65fe7847ad34
refs/heads/master: a58e26cb1163353d8a9b9cfd0d3f35df34f63141
8 changes: 8 additions & 0 deletions trunk/drivers/net/pcmcia/nmclan_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -1675,13 +1675,21 @@ static void set_multicast_list(struct net_device *dev)

} /* set_multicast_list */

static struct pcmcia_device_id nmclan_ids[] = {
PCMCIA_DEVICE_PROD_ID12("New Media Corporation", "Ethernet", 0x085a850b, 0x00b2e941),
PCMCIA_DEVICE_PROD_ID12("Portable Add-ons", "Ethernet", 0x0ebf1d60, 0x00b2e941),
PCMCIA_DEVICE_NULL,
};
MODULE_DEVICE_TABLE(pcmcia, nmclan_ids);

static struct pcmcia_driver nmclan_cs_driver = {
.owner = THIS_MODULE,
.drv = {
.name = "nmclan_cs",
},
.attach = nmclan_attach,
.detach = nmclan_detach,
.id_table = nmclan_ids,
};

static int __init init_nmclan_cs(void)
Expand Down

0 comments on commit 58dc546

Please sign in to comment.