Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / staging / comedi / drivers / ni_mio_cs.c

diff --git a/drivers/staging/comedi/drivers/ni_mio_cs.c b/drivers/staging/comedi/drivers/ni_mio_cs.c
index d50b6c409fe7b33385732651fc91a928a5a616a6..1f2426352eb57d82cc0c18ba98d738d224fe31cf 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_mio_cs.c
+++ b/drivers/staging/comedi/drivers/ni_mio_cs.c
@@ -260,7 +260,6 @@ static void cs_release(struct pcmcia_device *link);
 static void cs_detach(struct pcmcia_device *);
 
 static struct pcmcia_device *cur_dev = NULL;
-static const dev_info_t dev_info = "ni_mio_cs";
 
 static int cs_attach(struct pcmcia_device *link)
 {
@@ -448,7 +447,7 @@ struct pcmcia_driver ni_mio_cs_driver = {
        .id_table = ni_mio_cs_ids,
        .owner = THIS_MODULE,
        .drv = {
-               .name = dev_info,
+               .name = "ni_mio_cs",
                },
 };