Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317593
b: refs/heads/master
c: 2f01826
h: refs/heads/master
i:
  317591: 8c2563c
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jun 26, 2012
1 parent efd0ba4 commit 649964f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 11 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: bc314fb53f1557716bdb2bdae8bf6b898b0f8ab9
refs/heads/master: 2f01826783c95d7056304408c0046198d25e71b6
17 changes: 7 additions & 10 deletions trunk/drivers/staging/comedi/drivers/cb_das16_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,6 @@ struct das16cs_private {
};
#define devpriv ((struct das16cs_private *)dev->private)

static int das16cs_attach(struct comedi_device *dev,
struct comedi_devconfig *it);
static void das16cs_detach(struct comedi_device *dev);
static struct comedi_driver driver_das16cs = {
.driver_name = "cb_das16_cs",
.module = THIS_MODULE,
.attach = das16cs_attach,
.detach = das16cs_detach,
};

static struct pcmcia_device *cur_dev;

static const struct comedi_lrange das16cs_ai_range = { 4, {
Expand Down Expand Up @@ -623,6 +613,13 @@ static int das16cs_timer_insn_config(struct comedi_device *dev,
return -EINVAL;
}

static struct comedi_driver driver_das16cs = {
.driver_name = "cb_das16_cs",
.module = THIS_MODULE,
.attach = das16cs_attach,
.detach = das16cs_detach,
};

static int das16cs_pcmcia_config_loop(struct pcmcia_device *p_dev,
void *priv_data)
{
Expand Down

0 comments on commit 649964f

Please sign in to comment.