diff --git a/drivers/isdn/hardware/mISDN/contr.c b/drivers/isdn/hardware/mISDN/contr.c
index 6b2a73b..81510e4 100644
--- a/drivers/isdn/hardware/mISDN/contr.c
+++ b/drivers/isdn/hardware/mISDN/contr.c
@@ -608,11 +608,11 @@ ControllerConstr(Controller_t **contr_p, mISDNstack_t *st, mISDN_pid_t *pid, mIS
 	sprintf(contr->ctrl->name, "mISDN%d", st->id);
 	contr->ctrl->driver_name = "mISDN";
 	contr->ctrl->driverdata = contr;
-	contr->ctrl->register_appl = RegisterAppl;
-	contr->ctrl->release_appl = ReleaseAppl;
+	contr->ctrl->register_appl = RegisterApplication;
+	contr->ctrl->release_appl = ReleaseApplication;
 	contr->ctrl->send_message = SendMessage;
 	contr->ctrl->load_firmware = LoadFirmware;
-	contr->ctrl->reset_ctr = ResetContr;
+	contr->ctrl->reset_ctr = ResetController;
 	contr->ctrl->procinfo = procinfo;
 	contr->ctrl->ctr_read_proc = read_proc;
 	retval = attach_capi_ctr(contr->ctrl);
diff --git a/drivers/isdn/hardware/mISDN/core.c b/drivers/isdn/hardware/mISDN/core.c
index 84fbabb..8d817e4 100644
--- a/drivers/isdn/hardware/mISDN/core.c
+++ b/drivers/isdn/hardware/mISDN/core.c
@@ -445,7 +445,7 @@ mISDN_alloc_entity(int *entity)
 	spin_lock_irqsave(&entity_lock, flags);
 	*entity = 1;
 	while(*entity < MISDN_MAX_ENTITY) {
-		if (!test_and_set_bit(*entity, entityarray))
+		if (!test_and_set_bit(*entity, (u_long *)&entityarray[0]))
 			break;
 		(*entity)++;
 	}
@@ -462,7 +462,7 @@ mISDN_delete_entity(int entity)
 	int	ret = 0;
 
 	spin_lock_irqsave(&entity_lock, flags);
-	if (!test_and_clear_bit(entity, entityarray)) {
+	if (!test_and_clear_bit(entity, (u_long *)&entityarray[0])) {
 		printk(KERN_WARNING "mISDN: del_entity(%d) but entity not allocated\n", entity);
 		ret = -ENODEV;
 	}
diff --git a/drivers/isdn/hardware/mISDN/m_capi.h b/drivers/isdn/hardware/mISDN/m_capi.h
index d3d5c30..e504749 100755
--- a/drivers/isdn/hardware/mISDN/m_capi.h
+++ b/drivers/isdn/hardware/mISDN/m_capi.h
@@ -203,7 +203,7 @@ struct _Application {
 	__u32			CIPmask;
 	__u32			CIPmask2;
 	__u32			NotificationMask;
-	__u32			state;
+	u_long			state;
 	struct FsmInst		listen_m;
 	int			maxplci;
 	AppPlci_t		**AppPlcis;
@@ -224,7 +224,7 @@ struct _Plci {
 	Controller_t		*contr;
 	__u32			addr;
 	__u32			l3id;
-	__u32			state;
+	u_long			state;
 	int			nAppl;
 	struct list_head	AppPlcis;
 };
@@ -262,7 +262,7 @@ struct _Ncci {
 	Application_t		*appl;
 	struct FsmInst		ncci_m;
 	int			window;
-	__u32			state;
+	u_long			state;
 	ConfQueue_t		xmit_skb_handles[CAPI_MAXDATAWINDOW];
 	struct sk_buff		*recv_skb_handles[CAPI_MAXDATAWINDOW];
 	struct sk_buff_head	squeue;