From zaptel-commits at lists.digium.com  Tue May  4 16:36:06 2010
From: zaptel-commits at lists.digium.com (SVN commits to the Zaptel project)
Date: Tue, 04 May 2010 21:36:06 -0000
Subject: [zaptel-commits] qwell: branch 1.4 r4697 -
	/branches/1.4/kernel/wctc4xxp/base.c
Message-ID: <E1O9Pmg-00082j-Tz@wibble.digium.internal>

Author: qwell
Date: Tue May  4 16:36:03 2010
New Revision: 4697

URL: http://svnview.digium.com/svn/zaptel?view=rev&rev=4697
Log:
Fix inclusion of linux/io.h on 2.6.9 kernels. (from dahdi/linux/ r6549)

Modified:
    branches/1.4/kernel/wctc4xxp/base.c

Modified: branches/1.4/kernel/wctc4xxp/base.c
URL: http://svnview.digium.com/svn/zaptel/branches/1.4/kernel/wctc4xxp/base.c?view=diff&rev=4697&r1=4696&r2=4697
==============================================================================
--- branches/1.4/kernel/wctc4xxp/base.c (original)
+++ branches/1.4/kernel/wctc4xxp/base.c Tue May  4 16:36:03 2010
@@ -30,7 +30,6 @@
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
-#include <linux/io.h>
 #include <linux/jiffies.h>
 #include <linux/moduleparam.h>
 #include <linux/firmware.h>
@@ -41,6 +40,12 @@
 #include <linux/timer.h>
 
 #include "zaptel.h"
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18)
+#include <asm/io.h>
+#else
+#include <linux/io.h>
+#endif
 
 /* COMPILE TIME OPTIONS =================================================== */