aboutsummaryrefslogtreecommitdiffstats
path: root/package/ltq-dsl/src
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/src
parentaae6a9443289410feaae8814436abd3182bb4958 (diff)
downloadupstream-b387ede3d32221363f6a4b42b94ef15800d6cff2.tar.gz
upstream-b387ede3d32221363f6a4b42b94ef15800d6cff2.tar.bz2
upstream-b387ede3d32221363f6a4b42b94ef15800d6cff2.zip
* fixes dsl, ifxos, tapi and vmcc for .37
SVN-Revision: 26023
Diffstat (limited to 'package/ltq-dsl/src')
-rw-r--r--package/ltq-dsl/src/ifxmips_atm_core.c2
-rw-r--r--package/ltq-dsl/src/lantiq_mei.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/package/ltq-dsl/src/ifxmips_atm_core.c b/package/ltq-dsl/src/ifxmips_atm_core.c
index ae85d70650..55062d7455 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 7eeab33686..062b0286f9 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];