summaryrefslogtreecommitdiff
path: root/package/ltq-dsl
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-dsl
parentaae6a9443289410feaae8814436abd3182bb4958 (diff)
downloadmtk-20170518-b387ede3d32221363f6a4b42b94ef15800d6cff2.zip
mtk-20170518-b387ede3d32221363f6a4b42b94ef15800d6cff2.tar.gz
mtk-20170518-b387ede3d32221363f6a4b42b94ef15800d6cff2.tar.bz2
* fixes dsl, ifxos, tapi and vmcc for .37
SVN-Revision: 26023
Diffstat (limited to 'package/ltq-dsl')
-rw-r--r--package/ltq-dsl/patches/100-dsl_compat.patch13
-rw-r--r--package/ltq-dsl/src/ifxmips_atm_core.c2
-rw-r--r--package/ltq-dsl/src/lantiq_mei.c2
3 files changed, 13 insertions, 4 deletions
diff --git a/package/ltq-dsl/patches/100-dsl_compat.patch b/package/ltq-dsl/patches/100-dsl_compat.patch
index 334ac67..4897b33 100644
--- a/package/ltq-dsl/patches/100-dsl_compat.patch
+++ b/package/ltq-dsl/patches/100-dsl_compat.patch
@@ -19,7 +19,16 @@
#include "drv_dsl_cpe_api.h"
#include "drv_dsl_cpe_api_ioctl.h"
-@@ -1058,6 +1059,7 @@ static void DSL_DRV_DebugInit(void)
+@@ -72,7 +73,7 @@
+ open: DSL_DRV_Open,
+ release: DSL_DRV_Release,
+ write: DSL_DRV_Write,
+- ioctl: DSL_DRV_Ioctls,
++ unlocked_ioctl: DSL_DRV_Ioctls,
+ poll: DSL_DRV_Poll
+ };
+ #else
+@@ -1058,6 +1059,7 @@
/* Entry point of driver */
int __init DSL_ModuleInit(void)
{
@@ -27,7 +36,7 @@
DSL_int_t i;
printk(DSL_DRV_CRLF DSL_DRV_CRLF "Infineon CPE API Driver version: %s" DSL_DRV_CRLF,
-@@ -1104,7 +1106,8 @@ int __init DSL_ModuleInit(void)
+@@ -1104,7 +1106,8 @@
}
DSL_DRV_DevNodeInit();
diff --git a/package/ltq-dsl/src/ifxmips_atm_core.c b/package/ltq-dsl/src/ifxmips_atm_core.c
index ae85d70..55062d7 100644
--- a/package/ltq-dsl/src/ifxmips_atm_core.c
+++ b/package/ltq-dsl/src/ifxmips_atm_core.c
@@ -2403,7 +2403,7 @@ static int __devinit ifx_atm_init(void)
/* create devices */
for ( port_num = 0; port_num < ATM_PORT_NUMBER; port_num++ ) {
- g_atm_priv_data.port[port_num].dev = atm_dev_register("ifxmips_atm", &g_ifx_atm_ops, -1, NULL);
+ g_atm_priv_data.port[port_num].dev = atm_dev_register("ifxmips_atm", NULL, &g_ifx_atm_ops, -1, NULL);
if ( !g_atm_priv_data.port[port_num].dev ) {
err("failed to register atm device %d!", port_num);
ret = -EIO;
diff --git a/package/ltq-dsl/src/lantiq_mei.c b/package/ltq-dsl/src/lantiq_mei.c
index 7eeab33..062b028 100644
--- a/package/ltq-dsl/src/lantiq_mei.c
+++ b/package/ltq-dsl/src/lantiq_mei.c
@@ -200,7 +200,7 @@ static struct file_operations bsp_mei_operations = {
open:IFX_MEI_Open,
release:IFX_MEI_Release,
write:IFX_MEI_Write,
- ioctl:IFX_MEI_UserIoctls,
+ unlocked_ioctl:IFX_MEI_UserIoctls,
};
static DSL_DEV_Device_t dsl_devices[BSP_MAX_DEVICES];