make zaptel compile with kernels >2.6.25
[openwrt/svn-archive/archive.git] / libs / zaptel-1.4.x / patches / 320-zap-sema.patch
1 diff -Nru zaptel-1.4.9.2.org/kernel/wctdm24xxp/base.c zaptel-1.4.9.2/kernel/wctdm24xxp/base.c
2 --- zaptel-1.4.9.2.org/kernel/wctdm24xxp/base.c 2008-02-05 00:00:48.000000000 +0100
3 +++ zaptel-1.4.9.2/kernel/wctdm24xxp/base.c 2008-11-29 15:55:17.000000000 +0100
4 @@ -44,7 +44,11 @@
5 #include <linux/interrupt.h>
6 #include <linux/workqueue.h>
7 #include <linux/delay.h>
8 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
9 +#include <linux/semaphore.h>
10 +#else
11 #include <asm/semaphore.h>
12 +#endif
13
14 #ifdef LINUX26
15 #include <linux/moduleparam.h>
16 diff -Nru zaptel-1.4.9.2.org/kernel/wctdm24xxp/GpakApi.c zaptel-1.4.9.2/kernel/wctdm24xxp/GpakApi.c
17 --- zaptel-1.4.9.2.org/kernel/wctdm24xxp/GpakApi.c 2008-02-05 00:00:48.000000000 +0100
18 +++ zaptel-1.4.9.2/kernel/wctdm24xxp/GpakApi.c 2008-11-29 15:55:17.000000000 +0100
19 @@ -34,7 +34,11 @@
20 */
21
22 #include <linux/version.h>
23 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
24 +#include <linux/semaphore.h>
25 +#else
26 #include <asm/semaphore.h>
27 +#endif
28
29 #include "zaptel.h"
30
31 diff -Nru zaptel-1.4.9.2.org/kernel/wctdm24xxp/GpakCust.c zaptel-1.4.9.2/kernel/wctdm24xxp/GpakCust.c
32 --- zaptel-1.4.9.2.org/kernel/wctdm24xxp/GpakCust.c 2008-02-05 00:00:48.000000000 +0100
33 +++ zaptel-1.4.9.2/kernel/wctdm24xxp/GpakCust.c 2008-11-29 15:55:17.000000000 +0100
34 @@ -37,7 +37,11 @@
35
36 #include <linux/version.h>
37 #include <linux/delay.h>
38 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
39 +#include <linux/semaphore.h>
40 +#else
41 #include <asm/semaphore.h>
42 +#endif
43
44 #include "zaptel.h"
45 #include "wctdm24xxp.h"
46 diff -Nru zaptel-1.4.9.2.org/kernel/wcte12xp/vpmadt032.c zaptel-1.4.9.2/kernel/wcte12xp/vpmadt032.c
47 --- zaptel-1.4.9.2.org/kernel/wcte12xp/vpmadt032.c 2008-02-05 00:00:48.000000000 +0100
48 +++ zaptel-1.4.9.2/kernel/wcte12xp/vpmadt032.c 2008-11-29 15:55:17.000000000 +0100
49 @@ -29,7 +29,12 @@
50 */
51
52 #include <linux/delay.h>
53 +#include <linux/version.h>
54 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
55 +#include <linux/semaphore.h>
56 +#else
57 #include <asm/semaphore.h>
58 +#endif
59 #include <linux/pci.h>
60 #include <linux/firmware.h>
61 #include <linux/list.h>
62 diff -Nru zaptel-1.4.9.2.org/kernel/xpp/xpd.h zaptel-1.4.9.2/kernel/xpp/xpd.h
63 --- zaptel-1.4.9.2.org/kernel/xpp/xpd.h 2008-02-05 00:00:48.000000000 +0100
64 +++ zaptel-1.4.9.2/kernel/xpp/xpd.h 2008-11-29 15:55:17.000000000 +0100
65 @@ -29,8 +29,13 @@
66 #ifdef __KERNEL__
67 #include <linux/kernel.h>
68 #include <linux/device.h>
69 +#include <linux/version.h>
70 #include <asm/atomic.h>
71 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
72 +#include <linux/semaphore.h>
73 +#else
74 #include <asm/semaphore.h>
75 +#endif
76 #include <linux/moduleparam.h>
77 #ifdef XPP_DEBUGFS
78 #ifndef CONFIG_DEBUG_FS