From: Frank Mori Hess <fmhess@speakeasy.net>
Date: Tue, 11 Sep 2001 23:46:13 +0000 (+0000)
Subject: oops got LINUX_VERSION_CODE mixed up with KERNEL_VERSION_CODE
X-Git-Tag: r0_7_61~107
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=168d7bfdf1114c1abda835ce10de8aaae4fa42d6;p=comedi.git

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 a2ed7285..559674c1 100644
--- 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 85ae3c16..b94600a1 100644
--- 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