From 649964f251f57489967be92b81dce7813b457ae3 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 25 Jun 2012 16:23:38 -0700 Subject: [PATCH] --- yaml --- r: 317593 b: refs/heads/master c: 2f01826783c95d7056304408c0046198d25e71b6 h: refs/heads/master i: 317591: 8c2563ce8aae9c5a9f0f7cc7895be39685a6ee8d v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/cb_das16_cs.c | 17 +++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 3b1997a14776..62bd7a26c93b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc314fb53f1557716bdb2bdae8bf6b898b0f8ab9 +refs/heads/master: 2f01826783c95d7056304408c0046198d25e71b6 diff --git a/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c b/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c index 8661e135a5d4..92c774da25e8 100644 --- a/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c +++ b/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c @@ -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, { @@ -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) {