Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 354252
b: refs/heads/master
c: 098303c
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jan 30, 2013
1 parent 4212127 commit 71ff7e0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3e6c183306009b62c8de6e0d439ae61e7af22bc0
refs/heads/master: 098303caaf3a24e43a67d9a6e7d2f7d3033a601f
15 changes: 7 additions & 8 deletions trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -266,17 +266,16 @@ static const struct pcmcia_device_id labpc_cs_ids[] = {
PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0103), /* daqcard-1200 */
PCMCIA_DEVICE_NULL
};

MODULE_DEVICE_TABLE(pcmcia, labpc_cs_ids);

static struct pcmcia_driver labpc_cs_driver = {
.probe = labpc_cs_attach,
.remove = labpc_cs_detach,
.suspend = labpc_cs_suspend,
.resume = labpc_cs_resume,
.id_table = labpc_cs_ids,
.owner = THIS_MODULE,
.name = "daqcard-1200",
.name = "daqcard-1200",
.owner = THIS_MODULE,
.id_table = labpc_cs_ids,
.probe = labpc_cs_attach,
.remove = labpc_cs_detach,
.suspend = labpc_cs_suspend,
.resume = labpc_cs_resume,
};
module_comedi_pcmcia_driver(driver_labpc_cs, labpc_cs_driver);

Expand Down

0 comments on commit 71ff7e0

Please sign in to comment.