4897b3314003a8840d30cdd6c2a8f89fb057f92f
[openwrt/staging/yousong.git] / package / ltq-dsl / patches / 100-dsl_compat.patch
1 --- a/src/include/drv_dsl_cpe_device_danube.h
2 +++ b/src/include/drv_dsl_cpe_device_danube.h
3 @@ -24,7 +24,7 @@
4 #include "drv_dsl_cpe_simulator_danube.h"
5 #else
6 /* Include for the low level driver interface header file */
7 -#include "asm/ifx/ifx_mei_bsp.h"
8 +#include "mei/ifxmips_mei_interface.h"
9 #endif /* defined(DSL_CPE_SIMULATOR_DRIVER) && defined(WIN32)*/
10
11 #define DSL_MAX_LINE_NUMBER 1
12 --- a/src/common/drv_dsl_cpe_os_linux.c
13 +++ b/src/common/drv_dsl_cpe_os_linux.c
14 @@ -11,6 +11,7 @@
15 #ifdef __LINUX__
16
17 #define DSL_INTERN
18 +#include <linux/device.h>
19
20 #include "drv_dsl_cpe_api.h"
21 #include "drv_dsl_cpe_api_ioctl.h"
22 @@ -72,7 +73,7 @@
23 open: DSL_DRV_Open,
24 release: DSL_DRV_Release,
25 write: DSL_DRV_Write,
26 - ioctl: DSL_DRV_Ioctls,
27 + unlocked_ioctl: DSL_DRV_Ioctls,
28 poll: DSL_DRV_Poll
29 };
30 #else
31 @@ -1058,6 +1059,7 @@
32 /* Entry point of driver */
33 int __init DSL_ModuleInit(void)
34 {
35 + struct class *dsl_class;
36 DSL_int_t i;
37
38 printk(DSL_DRV_CRLF DSL_DRV_CRLF "Infineon CPE API Driver version: %s" DSL_DRV_CRLF,
39 @@ -1104,7 +1106,8 @@
40 }
41
42 DSL_DRV_DevNodeInit();
43 -
44 + dsl_class = class_create(THIS_MODULE, "dsl_cpe_api");
45 + device_create(dsl_class, NULL, MKDEV(DRV_DSL_CPE_API_DEV_MAJOR, 0), NULL, "dsl_cpe_api");
46 return 0;
47 }
48
49 --- a/src/include/drv_dsl_cpe_os_linux.h
50 +++ b/src/include/drv_dsl_cpe_os_linux.h
51 @@ -17,17 +17,17 @@
52 #endif
53
54 #include <asm/ioctl.h>
55 -#include <linux/autoconf.h>
56 +#include <generated/autoconf.h>
57 #include <linux/module.h>
58 #include <linux/kernel.h>
59 #include <linux/init.h>
60 #include <linux/ctype.h>
61 #include <linux/version.h>
62 #include <linux/spinlock.h>
63 -
64 +#include <linux/sched.h>
65
66 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
67 - #include <linux/utsrelease.h>
68 + #include <generated/utsrelease.h>
69 #endif
70
71 #include <linux/types.h>