Minor changes.

diff --git a/src/comedi/simple_driver/kernel/mf624.c b/src/comedi/simple_driver/kernel/mf624.c
index d47b5956814e66a35a4a78589b401dd18fe2b787..e9dabff74ad758a4903babdce14c1a13056d8a93 100755 (executable)
--- a/src/comedi/simple_driver/kernel/mf624.c
+++ b/src/comedi/simple_driver/kernel/mf624.c
@@ -55,7 +55,6 @@ none
 */
 #include "../comedidev.h"
 #include <linux/pci.h>
-#include "mf624.h"
 typedef unsigned int lsampl_t;
 
 #define EXTDEBUG 
@@ -64,13 +63,6 @@ typedef unsigned int lsampl_t;
 #define PCI_VENDOR_ID_MF624 0x186c
 #define PCI_DEVICE_ID_MF624 0x0624
 
-/* Subdevice numbers */
-#define MF624_SUBDEV_COUNT     4 /* Nr of subdevices */
-#define MF624_DO_SUBDEV                3
-#define MF624_DI_SUBDEV                2
-#define MF624_AO_SUBDEV                1
-#define MF624_AI_SUBDEV                0
-
 
 /* BADR0 Memory Map */
 #define MF624_GPIOC            0x54
@@ -276,8 +268,8 @@ found:
 
 #ifdef EXTDEBUG
        printk ("comedi%d: mf624: PCI Resource 0    addr %lx \n", dev->minor, devpriv->BADR0);
-       printk ("comedi%d: mf624: PCI Resource 1    addr %lx \n", dev->minor, devpriv->BADR1);
-       printk ("comedi%d: mf624: PCI Resource 2    addr %lx \n", dev->minor, devpriv->BADR2);
+       printk ("comedi%d: mf624: PCI Resource 2    addr %lx \n", dev->minor, devpriv->BADR1);
+       printk ("comedi%d: mf624: PCI Resource 4    addr %lx \n", dev->minor, devpriv->BADR2);
 
        printk ("comedi%d: mf624: IO_BADR0    addr %p \n", dev->minor, devpriv->IO_BADR0);
        printk ("comedi%d: mf624: IO_BADR1(2) addr %p \n", dev->minor, devpriv->IO_BADR1);
@@ -290,7 +282,7 @@ found:
         * Allocate the subdevice structures.  alloc_subdevice() is a
         * convenient macro defined in comedidev.h.
         */
-       if(alloc_subdevices(dev, MF624_SUBDEV_COUNT) < 0) {
+       if(alloc_subdevices(dev, 4) < 0) {
                return -ENOMEM;
        }