[svn-commits] kpfleming: linux/trunk r4801 - in /linux/trunk/drivers/dahdi: ./ wctdm24xxp/ ...

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Wed Aug 20 16:22:12 2008
New Revision: 4801

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

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

Modified:
    linux/trunk/drivers/dahdi/dahdi-base.c
    linux/trunk/drivers/dahdi/wctdm24xxp/GpakApi.c
    linux/trunk/drivers/dahdi/wctdm24xxp/GpakCust.c
    linux/trunk/drivers/dahdi/wctdm24xxp/base.c
    linux/trunk/drivers/dahdi/wctdm24xxp/wctdm24xxp.h
    linux/trunk/drivers/dahdi/wcte12xp/vpmadt032.c
    linux/trunk/drivers/dahdi/xpp/xpd.h

Modified: linux/trunk/drivers/dahdi/dahdi-base.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/dahdi-base.c?view=diff&rev=4801&r1=4800&r2=4801
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi-base.c (original)
+++ linux/trunk/drivers/dahdi/dahdi-base.c Wed Aug 20 16:22:12 2008
@@ -152,7 +152,10 @@
 static struct proc_dir_entry *proc_entries[DAHDI_MAX_SPANS];
 #endif
 
-#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)

Modified: linux/trunk/drivers/dahdi/wctdm24xxp/GpakApi.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/wctdm24xxp/GpakApi.c?view=diff&rev=4801&r1=4800&r2=4801
==============================================================================
--- linux/trunk/drivers/dahdi/wctdm24xxp/GpakApi.c (original)
+++ linux/trunk/drivers/dahdi/wctdm24xxp/GpakApi.c Wed Aug 20 16:22:12 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 <dahdi/kernel.h>
 

Modified: linux/trunk/drivers/dahdi/wctdm24xxp/GpakCust.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/wctdm24xxp/GpakCust.c?view=diff&rev=4801&r1=4800&r2=4801
==============================================================================
--- linux/trunk/drivers/dahdi/wctdm24xxp/GpakCust.c (original)
+++ linux/trunk/drivers/dahdi/wctdm24xxp/GpakCust.c Wed Aug 20 16:22:12 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 <dahdi/kernel.h>
 

Modified: linux/trunk/drivers/dahdi/wctdm24xxp/base.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=4801&r1=4800&r2=4801
==============================================================================
--- linux/trunk/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wctdm24xxp/base.c Wed Aug 20 16:22:12 2008
@@ -45,7 +45,11 @@
 #include <linux/workqueue.h>
 #include <linux/delay.h>
 #include <linux/moduleparam.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+#include <linux/semaphore.h>
+#else
 #include <asm/semaphore.h>
+#endif
 
 #include <dahdi/kernel.h>
 #include <dahdi/wctdm_user.h>

Modified: linux/trunk/drivers/dahdi/wctdm24xxp/wctdm24xxp.h
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/wctdm24xxp/wctdm24xxp.h?view=diff&rev=4801&r1=4800&r2=4801
==============================================================================
--- linux/trunk/drivers/dahdi/wctdm24xxp/wctdm24xxp.h (original)
+++ linux/trunk/drivers/dahdi/wctdm24xxp/wctdm24xxp.h Wed Aug 20 16:22:12 2008
@@ -29,7 +29,12 @@
 #include <dahdi/kernel.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: linux/trunk/drivers/dahdi/wcte12xp/vpmadt032.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/wcte12xp/vpmadt032.c?view=diff&rev=4801&r1=4800&r2=4801
==============================================================================
--- linux/trunk/drivers/dahdi/wcte12xp/vpmadt032.c (original)
+++ linux/trunk/drivers/dahdi/wcte12xp/vpmadt032.c Wed Aug 20 16:22:12 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: linux/trunk/drivers/dahdi/xpp/xpd.h
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/xpp/xpd.h?view=diff&rev=4801&r1=4800&r2=4801
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/xpd.h (original)
+++ linux/trunk/drivers/dahdi/xpp/xpd.h Wed Aug 20 16:22:12 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