[lantiq]
[openwrt/svn-archive/archive.git] / package / ltq-tapi / patches / linux-37.patch
1 --- a/src/drv_tapi_linux.c
2 +++ b/src/drv_tapi_linux.c
3 @@ -213,7 +213,7 @@
4 IFX_char_t *pRegDrvName = IFX_NULL;
5 IFX_int32_t ret = 0;
6
7 - if (tapi_fops.ioctl == IFX_NULL)
8 + if (tapi_fops.unlocked_ioctl == IFX_NULL)
9 {
10 #ifdef MODULE
11 tapi_fops.owner = THIS_MODULE;
12 @@ -221,7 +221,7 @@
13 tapi_fops.read = ifx_tapi_read;
14 tapi_fops.write = ifx_tapi_write;
15 tapi_fops.poll = ifx_tapi_poll;
16 - tapi_fops.ioctl = ifx_tapi_ioctl;
17 + tapi_fops.unlocked_ioctl = ifx_tapi_ioctl;
18 tapi_fops.open = ifx_tapi_open;
19 tapi_fops.release = ifx_tapi_release;
20 }
21 --- a/src/lib/lib_fifo/lib_fifo.c
22 +++ b/src/lib/lib_fifo/lib_fifo.c
23 @@ -41,7 +41,7 @@
24 #ifdef LINUX
25 /* if linux/slab.h is not available, use the precessor linux/malloc.h */
26 #include <linux/slab.h>
27 -#elif VXWORKS
28 +#elif defined(VXWORKS)
29 #include <sys_drv_debug.h>
30 #endif /* LINUX */
31