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

[mv-sheeva.git] / drivers / staging / comedi / drivers / ni_labpc_cs.c

diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c
index f204961e07867b97b1a79d0ca87b5d5f71d98aa7..68c4ecbd93ae83728c422f00da13e273a13d63a1 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_labpc_cs.c
+++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c
@@ -188,14 +188,6 @@ static void labpc_cs_detach(struct pcmcia_device *);
    less on other parts of the kernel.
 */
 
-/*
-   The dev_info variable is the "key" that is used to match up this
-   device driver with appropriate cards, through the card configuration
-   database.
-*/
-
-static const dev_info_t dev_info = "daqcard-1200";
-
 struct local_info_t {
        struct pcmcia_device *link;
        int stop;
@@ -420,7 +412,7 @@ struct pcmcia_driver labpc_cs_driver = {
        .id_table = labpc_cs_ids,
        .owner = THIS_MODULE,
        .drv = {
-               .name = dev_info,
+               .name = "daqcard-1200",
                },
 };