[backfire] merge r27449
[openwrt-10.03/.git] / package / ifxmips-dsl-api / 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 @@ -1058,6 +1059,7 @@ static void DSL_DRV_DebugInit(void)
23  /* Entry point of driver */
24  int __init DSL_ModuleInit(void)
25  {
26 +   struct class *dsl_class;
27     DSL_int_t i;
28  
29     printk(DSL_DRV_CRLF DSL_DRV_CRLF "Infineon CPE API Driver version: %s" DSL_DRV_CRLF,
30 @@ -1104,7 +1106,8 @@ int __init DSL_ModuleInit(void)
31     }
32  
33     DSL_DRV_DevNodeInit();
34 -
35 +   dsl_class = class_create(THIS_MODULE, "dsl_cpe_api");
36 +   device_create(dsl_class, NULL, MKDEV(DRV_DSL_CPE_API_DEV_MAJOR, 0), NULL, "dsl_cpe_api");
37     return 0;
38  }
39