Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 3763
b: refs/heads/master
c: 469bf2b
h: refs/heads/master
i:
  3761: 8c76e9c
  3759: f686a82
v: v3
  • Loading branch information
Dominik Brodowski authored and Linus Torvalds committed Jun 28, 2005
1 parent ef67646 commit e83b808
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: cda4de8e1e51d55f02c64210ddbaca73997f890d
refs/heads/master: 469bf2b9389c9265ac0920da5b1a5c71fe496213
8 changes: 8 additions & 0 deletions trunk/drivers/net/pcmcia/ibmtr_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -508,13 +508,21 @@ static void ibmtr_hw_setup(struct net_device *dev, u_int mmiobase)
return;
}

static struct pcmcia_device_id ibmtr_ids[] = {
PCMCIA_DEVICE_PROD_ID12("3Com", "TokenLink Velocity PC Card", 0x41240e5b, 0x82c3734e),
PCMCIA_DEVICE_PROD_ID12("IBM", "TOKEN RING", 0xb569a6e5, 0xbf8eed47),
PCMCIA_DEVICE_NULL,
};
MODULE_DEVICE_TABLE(pcmcia, ibmtr_ids);

static struct pcmcia_driver ibmtr_cs_driver = {
.owner = THIS_MODULE,
.drv = {
.name = "ibmtr_cs",
},
.attach = ibmtr_attach,
.detach = ibmtr_detach,
.id_table = ibmtr_ids,
};

static int __init init_ibmtr_cs(void)
Expand Down

0 comments on commit e83b808

Please sign in to comment.