aboutsummaryrefslogtreecommitdiffstats
path: root/package/ltq-tapi/patches/linux-37.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2011-03-11 08:21:21 +0000
committerJohn Crispin <john@openwrt.org>2011-03-11 08:21:21 +0000
commitb387ede3d32221363f6a4b42b94ef15800d6cff2 (patch)
treee566e7985518b98ad4849ddd588f9499784ad9aa /package/ltq-tapi/patches/linux-37.patch
parentaae6a9443289410feaae8814436abd3182bb4958 (diff)
downloadupstream-b387ede3d32221363f6a4b42b94ef15800d6cff2.tar.gz
upstream-b387ede3d32221363f6a4b42b94ef15800d6cff2.tar.bz2
upstream-b387ede3d32221363f6a4b42b94ef15800d6cff2.zip
* fixes dsl, ifxos, tapi and vmcc for .37
SVN-Revision: 26023
Diffstat (limited to 'package/ltq-tapi/patches/linux-37.patch')
-rw-r--r--package/ltq-tapi/patches/linux-37.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/package/ltq-tapi/patches/linux-37.patch b/package/ltq-tapi/patches/linux-37.patch
new file mode 100644
index 0000000000..6266ca14a8
--- /dev/null
+++ b/package/ltq-tapi/patches/linux-37.patch
@@ -0,0 +1,31 @@
+--- a/src/drv_tapi_linux.c
++++ b/src/drv_tapi_linux.c
+@@ -213,7 +213,7 @@
+ IFX_char_t *pRegDrvName = IFX_NULL;
+ IFX_int32_t ret = 0;
+
+- if (tapi_fops.ioctl == IFX_NULL)
++ if (tapi_fops.unlocked_ioctl == IFX_NULL)
+ {
+ #ifdef MODULE
+ tapi_fops.owner = THIS_MODULE;
+@@ -221,7 +221,7 @@
+ tapi_fops.read = ifx_tapi_read;
+ tapi_fops.write = ifx_tapi_write;
+ tapi_fops.poll = ifx_tapi_poll;
+- tapi_fops.ioctl = ifx_tapi_ioctl;
++ tapi_fops.unlocked_ioctl = ifx_tapi_ioctl;
+ tapi_fops.open = ifx_tapi_open;
+ tapi_fops.release = ifx_tapi_release;
+ }
+--- a/src/lib/lib_fifo/lib_fifo.c
++++ b/src/lib/lib_fifo/lib_fifo.c
+@@ -41,7 +41,7 @@
+ #ifdef LINUX
+ /* if linux/slab.h is not available, use the precessor linux/malloc.h */
+ #include <linux/slab.h>
+-#elif VXWORKS
++#elif defined(VXWORKS)
+ #include <sys_drv_debug.h>
+ #endif /* LINUX */
+