oops got LINUX_VERSION_CODE mixed up with KERNEL_VERSION_CODE

diff --git a/comedi/drivers/cb_pcidas64.c b/comedi/drivers/cb_pcidas64.c
index a2ed72853194101b79cbaf3bc3c9b32b98d46b9a..559674c120db769541c91276dba767050219f5ba 100644 (file)
--- a/comedi/drivers/cb_pcidas64.c
+++ b/comedi/drivers/cb_pcidas64.c
@@ -483,8 +483,6 @@ found:
                pcidev->resource[DIO_COUNTER_BADRINDEX].start &
                PCI_BASE_ADDRESS_MEM_MASK;
 
-#if KERNEL_VERSION_CODE >= KERNEL_VERSION(2,3,17)
-
        if(check_mem_region(plx9080_iobase, PLX9080_IOSIZE))
        {
                /* Couldn't allocate io space */
@@ -511,7 +509,6 @@ found:
        request_mem_region(dio_counter_iobase, DIO_COUNTER_IOSIZE, "cb_pcidas64");
        devpriv->dio_counter_phys_iobase = dio_counter_iobase;
 
-#endif
 #endif
 
        // remap, won't work with 2.0 kernels but who cares
@@ -657,14 +654,12 @@ static int detach(comedi_device *dev)
                        iounmap((void*)devpriv->main_iobase);
                if(devpriv->dio_counter_iobase)
                        iounmap((void*)devpriv->dio_counter_iobase);
-#if KERNEL_VERSION_CODE >= KERNEL_VERSION(2,3,17)
                if(devpriv->plx9080_phys_iobase)
                        release_mem_region(devpriv->plx9080_iobase, PLX9080_IOSIZE);
                if(devpriv->main_iobase)
                        release_mem_region(devpriv->main_phys_iobase, MAIN_IOSIZE);
                if(devpriv->dio_counter_iobase)
                        release_mem_region(devpriv->dio_counter_phys_iobase, DIO_COUNTER_IOSIZE);
-#endif
        }
        if(dev->irq)
                comedi_free_irq(dev->irq, dev);

diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index 85ae3c169f936739458901e74f2d0247b0a790f9..b94600a152ef3084b19d6bb19327eaa840f08ca4 100644 (file)
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -5,7 +5,7 @@
 
 #include <linux/version.h>
 
-#if KERNEL_VERSION_CODE < KERNEL_VERSION(2,3,17)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,17)
 
 #define check_mem_region(start,n) 0
 #define request_mem_region(start,n,name) 0