diff --git a/[refs] b/[refs] index f0be2e20649e..98dbacec7d5b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 885d8bce7f6e834c190ee3c60561c1c6c0e6174b +refs/heads/master: 3e6c183306009b62c8de6e0d439ae61e7af22bc0 diff --git a/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c b/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c index b26496df3e96..7d9fce914d00 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c +++ b/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c @@ -268,9 +268,6 @@ static const struct pcmcia_device_id labpc_cs_ids[] = { }; MODULE_DEVICE_TABLE(pcmcia, labpc_cs_ids); -MODULE_AUTHOR("Frank Mori Hess "); -MODULE_DESCRIPTION("Comedi driver for National Instruments Lab-PC"); -MODULE_LICENSE("GPL"); static struct pcmcia_driver labpc_cs_driver = { .probe = labpc_cs_attach, @@ -281,5 +278,8 @@ static struct pcmcia_driver labpc_cs_driver = { .owner = THIS_MODULE, .name = "daqcard-1200", }; - module_comedi_pcmcia_driver(driver_labpc_cs, labpc_cs_driver); + +MODULE_DESCRIPTION("Comedi driver for National Instruments Lab-PC"); +MODULE_AUTHOR("Frank Mori Hess "); +MODULE_LICENSE("GPL");