changed dev_info names so pcmcia script will run comedi_config correctly

diff --git a/comedi/drivers/das08.c b/comedi/drivers/das08.c
index 1b871623d102b5f0195e6c5a22720de05b720878..b0f442d43940b439d744dea3bcdfae5a6c25525f 100644 (file)
--- a/comedi/drivers/das08.c
+++ b/comedi/drivers/das08.c
@@ -994,7 +994,7 @@ static void das08_pcmcia_detach(dev_link_t *);
    database.
 */
 
-static dev_info_t dev_info = "das08";
+static dev_info_t dev_info = "pcm-das08";
 
 /*
    A dev_link_t structure has fields for most things that are needed

diff --git a/comedi/drivers/ni_labpc.c b/comedi/drivers/ni_labpc.c
index 38e3828ab6985637c5b3fd4ee6c6b5a189b19532..873c99edb751d3382fbdd08eea172403b4416d1c 100644 (file)
--- a/comedi/drivers/ni_labpc.c
+++ b/comedi/drivers/ni_labpc.c
@@ -2295,7 +2295,7 @@ static void labpc_cs_detach(dev_link_t *);
    database.
 */
 
-static dev_info_t dev_info = "ni_labpc";
+static dev_info_t dev_info = "daqcard-1200";
 
 /*
    A dev_link_t structure has fields for most things that are needed
@@ -2376,9 +2376,8 @@ static dev_link_t *labpc_cs_attach(void)
     link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
     link->irq.IRQInfo1 = IRQ_INFO2_VALID|IRQ_LEVEL_ID;
     if (irq_list[0] == -1)
-       link->irq.IRQInfo2 = irq_mask;
-    else
-       for (i = 0; i < 4; i++)
+               link->irq.IRQInfo2 = irq_mask;
+    else for (i = 0; i < 4; i++)
            link->irq.IRQInfo2 |= 1 << irq_list[i];
     link->irq.Handler = NULL;