[svn-commits] kpfleming: branch 1.4 r4496 - in /branches/1.4/kernel: ./ wctdm24xxp/ wcte12x...

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Wed Aug 20 16:16:40 2008
New Revision: 4496

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4496
Log:
improve compatibility with 2.6.26 and 2.6.27 kernels

(closes issue #13277)
Reported by: smurfix
Patches:
      zap-dev.patch uploaded by smurfix (license 547)
      zap-sema.patch uploaded by smurfix (license 547)

Modified:
    branches/1.4/kernel/wctdm24xxp/GpakApi.c
    branches/1.4/kernel/wctdm24xxp/GpakCust.c
    branches/1.4/kernel/wctdm24xxp/base.c
    branches/1.4/kernel/wctdm24xxp/wctdm24xxp.h
    branches/1.4/kernel/wcte12xp/vpmadt032.c
    branches/1.4/kernel/xpp/xpd.h
    branches/1.4/kernel/zaptel-base.c

Modified: branches/1.4/kernel/wctdm24xxp/GpakApi.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wctdm24xxp/GpakApi.c?view=diff&rev=4496&r1=4495&r2=4496
==============================================================================
--- branches/1.4/kernel/wctdm24xxp/GpakApi.c (original)
+++ branches/1.4/kernel/wctdm24xxp/GpakApi.c Wed Aug 20 16:16:40 2008
@@ -33,7 +33,11 @@
  */
 
 #include <linux/version.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+#include <linux/semaphore.h>
+#else
 #include <asm/semaphore.h>
+#endif
 
 #include "zaptel.h"
 

Modified: branches/1.4/kernel/wctdm24xxp/GpakCust.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wctdm24xxp/GpakCust.c?view=diff&rev=4496&r1=4495&r2=4496
==============================================================================
--- branches/1.4/kernel/wctdm24xxp/GpakCust.c (original)
+++ branches/1.4/kernel/wctdm24xxp/GpakCust.c Wed Aug 20 16:16:40 2008
@@ -35,7 +35,11 @@
 
 #include <linux/version.h>
 #include <linux/delay.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+#include <linux/semaphore.h>
+#else
 #include <asm/semaphore.h>
+#endif
 
 #include "zaptel.h"
 #include "wctdm24xxp.h"

Modified: branches/1.4/kernel/wctdm24xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wctdm24xxp/base.c?view=diff&rev=4496&r1=4495&r2=4496
==============================================================================
--- branches/1.4/kernel/wctdm24xxp/base.c (original)
+++ branches/1.4/kernel/wctdm24xxp/base.c Wed Aug 20 16:16:40 2008
@@ -44,7 +44,11 @@
 #include <linux/interrupt.h>
 #include <linux/workqueue.h>
 #include <linux/delay.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+#include <linux/semaphore.h>
+#else
 #include <asm/semaphore.h>
+#endif
 
 #ifdef LINUX26
 #include <linux/moduleparam.h>

Modified: branches/1.4/kernel/wctdm24xxp/wctdm24xxp.h
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wctdm24xxp/wctdm24xxp.h?view=diff&rev=4496&r1=4495&r2=4496
==============================================================================
--- branches/1.4/kernel/wctdm24xxp/wctdm24xxp.h (original)
+++ branches/1.4/kernel/wctdm24xxp/wctdm24xxp.h Wed Aug 20 16:16:40 2008
@@ -28,7 +28,12 @@
 
 #include "../zaptel.h"
 #include "../voicebus.h"
+#include <linux/version.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+#include <linux/semaphore.h>
+#else
 #include <asm/semaphore.h>
+#endif
 
 #define NUM_FXO_REGS 60
 

Modified: branches/1.4/kernel/wcte12xp/vpmadt032.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wcte12xp/vpmadt032.c?view=diff&rev=4496&r1=4495&r2=4496
==============================================================================
--- branches/1.4/kernel/wcte12xp/vpmadt032.c (original)
+++ branches/1.4/kernel/wcte12xp/vpmadt032.c Wed Aug 20 16:16:40 2008
@@ -28,7 +28,12 @@
  */
 
 #include <linux/delay.h>
+#include <linux/version.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+#include <linux/semaphore.h>
+#else
 #include <asm/semaphore.h>
+#endif
 #include <linux/pci.h> 
 #include <linux/firmware.h> 
 #include <linux/list.h> 

Modified: branches/1.4/kernel/xpp/xpd.h
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/xpp/xpd.h?view=diff&rev=4496&r1=4495&r2=4496
==============================================================================
--- branches/1.4/kernel/xpp/xpd.h (original)
+++ branches/1.4/kernel/xpp/xpd.h Wed Aug 20 16:16:40 2008
@@ -29,8 +29,13 @@
 #ifdef	__KERNEL__
 #include <linux/kernel.h>
 #include <linux/device.h>
+#include <linux/version.h>
 #include <asm/atomic.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+#include <linux/semaphore.h>
+#else
 #include <asm/semaphore.h>
+#endif
 #include <linux/moduleparam.h>
 #ifdef	XPP_DEBUGFS
 #ifndef	CONFIG_DEBUG_FS

Modified: branches/1.4/kernel/zaptel-base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/zaptel-base.c?view=diff&rev=4496&r1=4495&r2=4496
==============================================================================
--- branches/1.4/kernel/zaptel-base.c (original)
+++ branches/1.4/kernel/zaptel-base.c Wed Aug 20 16:16:40 2008
@@ -162,7 +162,10 @@
 /* udev necessary data structures.  Yeah! */
 #ifdef CONFIG_ZAP_UDEV
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
+#define CLASS_DEV_CREATE(class, devt, device, name) \
+	device_create(class, device, devt, NULL, "%s", name)
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
 #define CLASS_DEV_CREATE(class, devt, device, name) \
 	device_create(class, device, devt, name)
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)