Give the different addi_apci_* drivers different comedi driver names.

diff --git a/comedi/drivers/addi-data/addi_common.c b/comedi/drivers/addi-data/addi_common.c
index 68571cdbb44d88eaad8e3f94508fecfe453cf4d5..a6ab05f64a492df6c1c22b8e4016ee315844a73f 100644 (file)
--- a/comedi/drivers/addi-data/addi_common.c
+++ b/comedi/drivers/addi-data/addi_common.c
@@ -68,6 +68,10 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
 #include "addi_common.h"
 #include "addi_amcc_s5933.h"
 
+#ifndef ADDIDATA_DRIVER_NAME
+#define ADDIDATA_DRIVER_NAME   "addi_common"
+#endif
+
 //Update-0.7.57->0.7.68MODULE_AUTHOR("ADDI-DATA GmbH <info@addi-data.com>");
 //Update-0.7.57->0.7.68MODULE_DESCRIPTION("Comedi ADDI-DATA module");
 //Update-0.7.57->0.7.68MODULE_LICENSE("GPL");
@@ -2528,7 +2532,7 @@ static const boardtype boardtypes[] = {
 #define n_boardtypes (sizeof(boardtypes)/sizeof(boardtype))
 
 comedi_driver driver_addi = {
-      driver_name:"addi_common",
+      driver_name:ADDIDATA_DRIVER_NAME,
       module:THIS_MODULE,
       attach:i_ADDI_Attach,
       detach:i_ADDI_Detach,
@@ -2583,7 +2587,7 @@ static int i_ADDI_Attach(comedi_device * dev, comedi_devconfig * it)
                v_pci_card_list_init(this_board->i_VendorId, 1);        //1 for displaying the list..
                pci_list_builded = 1;
        }
-       //rt_printk("comedi%d: addi_common: board=%s",dev->minor,this_board->pc_DriverName);
+       //rt_printk("comedi%d: "ADDIDATA_DRIVER_NAME": board=%s",dev->minor,this_board->pc_DriverName);
 
        if ((this_board->i_Dma) && (it->options[2] == 0)) {
                i_Dma = 1;

diff --git a/comedi/drivers/addi_apci_035.c b/comedi/drivers/addi_apci_035.c
index bac018202fe85b99fbdd1aa47cf6ddd30fdf312c..b6fcb06f6abb6daa839c3a6c2f391da95c692c01 100644 (file)
--- a/comedi/drivers/addi_apci_035.c
+++ b/comedi/drivers/addi_apci_035.c
@@ -2,4 +2,6 @@
 
 #define ADDIDATA_WATCHDOG 2    // Or shold it be something else
 
+#define ADDIDATA_DRIVER_NAME "addi_apci_035"
+
 #include "addi-data/addi_common.c"

diff --git a/comedi/drivers/addi_apci_1032.c b/comedi/drivers/addi_apci_1032.c
index fa2056e8aa0ece225245701122c1b3bc73423106..89b1c1de6a5d0323a8505a41dcb9787f7cd3b37c 100644 (file)
--- a/comedi/drivers/addi_apci_1032.c
+++ b/comedi/drivers/addi_apci_1032.c
@@ -1,3 +1,5 @@
 #define CONFIG_APCI_1032 1
 
+#define ADDIDATA_DRIVER_NAME "addi_apci_1032"
+
 #include "addi-data/addi_common.c"

diff --git a/comedi/drivers/addi_apci_1500.c b/comedi/drivers/addi_apci_1500.c
index 7a5cae599ef80650fc5b8050f63a6dc520641e8d..e39c4d5d6b9676757f1184babf36bf672a009f7f 100644 (file)
--- a/comedi/drivers/addi_apci_1500.c
+++ b/comedi/drivers/addi_apci_1500.c
@@ -1,3 +1,5 @@
 #define CONFIG_APCI_1500 1
 
+#define ADDIDATA_DRIVER_NAME "addi_apci_1500"
+
 #include "addi-data/addi_common.c"

diff --git a/comedi/drivers/addi_apci_1516.c b/comedi/drivers/addi_apci_1516.c
index 8d414844009f6455e23d8af82ccabc2588a0d3db..a5b5b6de584a8ea5739613376f61de785426d8de 100644 (file)
--- a/comedi/drivers/addi_apci_1516.c
+++ b/comedi/drivers/addi_apci_1516.c
@@ -1,3 +1,5 @@
 #define CONFIG_APCI_1516 1
 
+#define ADDIDATA_DRIVER_NAME "addi_apci_1516"
+
 #include "addi-data/addi_common.c"

diff --git a/comedi/drivers/addi_apci_1564.c b/comedi/drivers/addi_apci_1564.c
index 0351cdde102623b628cc2a6111014884d51a80e5..381687a351457548ccb6666ebe80cc23d1765237 100644 (file)
--- a/comedi/drivers/addi_apci_1564.c
+++ b/comedi/drivers/addi_apci_1564.c
@@ -1,3 +1,5 @@
 #define CONFIG_APCI_1564 1
 
+#define ADDIDATA_DRIVER_NAME "addi_apci_1564"
+
 #include "addi-data/addi_common.c"

diff --git a/comedi/drivers/addi_apci_16xx.c b/comedi/drivers/addi_apci_16xx.c
index 5067990412948e676193b221e0fefc8d7faafa92..ab94dca1a00caa015fd317a4b7cd1926974a84c5 100644 (file)
--- a/comedi/drivers/addi_apci_16xx.c
+++ b/comedi/drivers/addi_apci_16xx.c
@@ -1,3 +1,5 @@
 #define CONFIG_APCI_16XX 1
 
+#define ADDIDATA_DRIVER_NAME "addi_apci_16xx"
+
 #include "addi-data/addi_common.c"

diff --git a/comedi/drivers/addi_apci_1710.c b/comedi/drivers/addi_apci_1710.c
index c433445913dd828bf63eb4499c1e5111c4d6495c..c73e05619573851716bf3af09dd0d677765bf6bc 100644 (file)
--- a/comedi/drivers/addi_apci_1710.c
+++ b/comedi/drivers/addi_apci_1710.c
@@ -1,3 +1,5 @@
 #define CONFIG_APCI_1710 1
 
+#define ADDIDATA_DRIVER_NAME "addi_apci_1710"
+
 #include "addi-data/addi_common.c"

diff --git a/comedi/drivers/addi_apci_2016.c b/comedi/drivers/addi_apci_2016.c
index 271c47c8cad3c5bb997ae42e03adf6ec20a5047f..291335c101a2f0a739bee7f5ef7e39979ca7c183 100644 (file)
--- a/comedi/drivers/addi_apci_2016.c
+++ b/comedi/drivers/addi_apci_2016.c
@@ -1,3 +1,5 @@
 #define CONFIG_APCI_2016 1
 
+#define ADDIDATA_DRIVER_NAME "addi_apci_2016"
+
 #include "addi-data/addi_common.c"

diff --git a/comedi/drivers/addi_apci_2032.c b/comedi/drivers/addi_apci_2032.c
index 5108ea2a392435835b6a9181d7b9d8f136ac6f19..2bdc4ec29ee3612d6f51aab65c653cce5003671a 100644 (file)
--- a/comedi/drivers/addi_apci_2032.c
+++ b/comedi/drivers/addi_apci_2032.c
@@ -1,3 +1,5 @@
 #define CONFIG_APCI_2032 1
 
+#define ADDIDATA_DRIVER_NAME "addi_apci_2032"
+
 #include "addi-data/addi_common.c"

diff --git a/comedi/drivers/addi_apci_2200.c b/comedi/drivers/addi_apci_2200.c
index e439f835cf4f77a1bae8d8d765c032af72bd5cf2..4ce00b13658e6455a11a5802288e9a408b0d0e8d 100644 (file)
--- a/comedi/drivers/addi_apci_2200.c
+++ b/comedi/drivers/addi_apci_2200.c
@@ -1,3 +1,5 @@
 #define CONFIG_APCI_2200 1
 
+#define ADDIDATA_DRIVER_NAME "addi_apci_2200"
+
 #include "addi-data/addi_common.c"

diff --git a/comedi/drivers/addi_apci_3001.c b/comedi/drivers/addi_apci_3001.c
index df97c305828b562cf582fbe62b6df6eefca58a62..0f73ad58f2822334915e00ba12b9005d4411a704 100644 (file)
--- a/comedi/drivers/addi_apci_3001.c
+++ b/comedi/drivers/addi_apci_3001.c
@@ -1,3 +1,5 @@
 #define CONFIG_APCI_3001 1
 
+#define ADDIDATA_DRIVER_NAME "addi_apci_3001"
+
 #include "addi-data/addi_common.c"

diff --git a/comedi/drivers/addi_apci_3120.c b/comedi/drivers/addi_apci_3120.c
index 9183125ddde413cbc6d21307caa33a285a5db830..3f9739b4f774449d1e30331196e44f33f6f012a0 100644 (file)
--- a/comedi/drivers/addi_apci_3120.c
+++ b/comedi/drivers/addi_apci_3120.c
@@ -1,3 +1,5 @@
 #define CONFIG_APCI_3120 1
 
+#define ADDIDATA_DRIVER_NAME "addi_apci_3120"
+
 #include "addi-data/addi_common.c"

diff --git a/comedi/drivers/addi_apci_3200.c b/comedi/drivers/addi_apci_3200.c
index f25a70b3290b4784de5c842f14dbd1b055ab55fd..f959c49819febe57c228c2aa6f04dab0f13e67a4 100644 (file)
--- a/comedi/drivers/addi_apci_3200.c
+++ b/comedi/drivers/addi_apci_3200.c
@@ -1,3 +1,5 @@
 #define CONFIG_APCI_3200 1
 
+#define ADDIDATA_DRIVER_NAME "addi_apci_3200"
+
 #include "addi-data/addi_common.c"

diff --git a/comedi/drivers/addi_apci_3300.c b/comedi/drivers/addi_apci_3300.c
index 1ee4778ad45b38a58de4787e3b003d5ce2452602..5baa636255aa0999fc5dba5dadc946ac8b475024 100644 (file)
--- a/comedi/drivers/addi_apci_3300.c
+++ b/comedi/drivers/addi_apci_3300.c
@@ -1,3 +1,5 @@
 #define CONFIG_APCI_3300 1
 
+#define ADDIDATA_DRIVER_NAME "addi_apci_3300"
+
 #include "addi-data/addi_common.c"

diff --git a/comedi/drivers/addi_apci_3501.c b/comedi/drivers/addi_apci_3501.c
index 1049e20237e8284357048c22befc1a4200b4f9a3..1be0e8560b9fa8eb31c72ea0fc2389885b8bd8bb 100644 (file)
--- a/comedi/drivers/addi_apci_3501.c
+++ b/comedi/drivers/addi_apci_3501.c
@@ -1,3 +1,5 @@
 #define CONFIG_APCI_3501 1
 
+#define ADDIDATA_DRIVER_NAME "addi_apci_3501"
+
 #include "addi-data/addi_common.c"

diff --git a/comedi/drivers/addi_apci_3xxx.c b/comedi/drivers/addi_apci_3xxx.c
index fb9deb7083bdf5998dedd160c3ff033c99860909..ff88fac0a785ce3a549b4d74902d47e7325769a5 100644 (file)
--- a/comedi/drivers/addi_apci_3xxx.c
+++ b/comedi/drivers/addi_apci_3xxx.c
@@ -1,3 +1,5 @@
 #define CONFIG_APCI_3XXX 1
 
+#define ADDIDATA_DRIVER_NAME "addi_apci_3xxx"
+
 #include "addi-data/addi_common.c"