diff options
| author | John Crispin <john@openwrt.org> | 2011-03-29 05:17:10 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2011-03-29 05:17:10 +0000 |
| commit | db56769b0a1c5b9bcc4506850de78ceeeb7f4334 (patch) | |
| tree | f369371c34c3899fbb890b060adb71b43b645349 /package/ltq-tapi/patches/linux-37.patch | |
| parent | 1dbabd309b922bb5782755f11615317068915da3 (diff) | |
| download | upstream-db56769b0a1c5b9bcc4506850de78ceeeb7f4334.tar.gz upstream-db56769b0a1c5b9bcc4506850de78ceeeb7f4334.tar.bz2 upstream-db56769b0a1c5b9bcc4506850de78ceeeb7f4334.zip | |
* several updates to the voice packages
SVN-Revision: 26351
Diffstat (limited to 'package/ltq-tapi/patches/linux-37.patch')
| -rw-r--r-- | package/ltq-tapi/patches/linux-37.patch | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/package/ltq-tapi/patches/linux-37.patch b/package/ltq-tapi/patches/linux-37.patch deleted file mode 100644 index 5d5ff7ed3e..0000000000 --- a/package/ltq-tapi/patches/linux-37.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- a/src/drv_tapi_linux.c -+++ b/src/drv_tapi_linux.c -@@ -128,8 +128,13 @@ - size_t count, loff_t * ppos); - static ssize_t ifx_tapi_read(struct file * filp, char *buf, - size_t length, loff_t * ppos); -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)) - static int ifx_tapi_ioctl(struct inode *inode, struct file *filp, - unsigned int nCmd, unsigned long nArgument); -+#else -+static int ifx_tapi_ioctl(struct file *filp, -+ unsigned int nCmd, unsigned long nArgument); -+#endif - static unsigned int ifx_tapi_poll (struct file *filp, poll_table *table); - - #ifdef CONFIG_PROC_FS -@@ -213,7 +218,11 @@ - IFX_char_t *pRegDrvName = IFX_NULL; - IFX_int32_t ret = 0; - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)) - if (tapi_fops.ioctl == IFX_NULL) -+#else -+ if (tapi_fops.unlocked_ioctl == IFX_NULL) -+#endif - { - #ifdef MODULE - tapi_fops.owner = THIS_MODULE; -@@ -221,7 +230,11 @@ - tapi_fops.read = ifx_tapi_read; - tapi_fops.write = ifx_tapi_write; - tapi_fops.poll = ifx_tapi_poll; -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)) - tapi_fops.ioctl = ifx_tapi_ioctl; -+#else -+ tapi_fops.unlocked_ioctl = ifx_tapi_ioctl; -+#endif - tapi_fops.open = ifx_tapi_open; - tapi_fops.release = ifx_tapi_release; - } -@@ -876,8 +889,13 @@ - - 0 and positive values - success - - negative value - ioctl failed - */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)) - static int ifx_tapi_ioctl(struct inode *inode, struct file *filp, - unsigned int nCmd, unsigned long nArg) -+#else -+static int ifx_tapi_ioctl(struct file *filp, -+ unsigned int nCmd, unsigned long nArg) -+#endif - { - TAPI_FD_PRIV_DATA_t *pTapiPriv; - IFX_TAPI_ioctlCtx_t ctx; ---- 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 */ - |