Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8de65c2a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '20120221_isdn' of git://repo.or.cz/linux-2.6/trivial-mods

parents fc0d7536 475be4d8

drivers/isdn/capi/kcapi.h

+5 −6
Original line number Diff line number Diff line
@@ -49,4 +49,3 @@ static inline void kcapi_proc_init(void) { }; 
static inline void kcapi_proc_exit(void) { };



#endif

drivers/isdn/divert/divert_init.c

+37 −38
Original line number Diff line number Diff line
@@ -79,4 +79,3 @@ static void __exit divert_exit(void) 


module_init(divert_init);

module_exit(divert_exit);

drivers/isdn/divert/isdn_divert.c

+737 −738
Original line number Diff line number Diff line
@@ -860,4 +860,3 @@ int ll_callback(isdn_ctrl *ic) 
		return (isdn_divert_stat_callback(ic));

	}

} /* ll_callback */

drivers/isdn/hardware/eicon/dadapter.c

+287 −289
Original line number Diff line number Diff line 


/*

 *

 Copyright (c) Eicon Networks, 2002.
@@ -363,4 +362,3 @@ void IDI_CALL_LINK_T DIVA_DIDD_Read (void IDI_CALL_ENTITY_T * buffer, 
				    int length) {

	diva_didd_read_adapter_array(buffer, length);

}

drivers/isdn/hardware/eicon/debug.c

+1759 −1760
Original line number Diff line number Diff line
@@ -2129,4 +2129,3 @@ static void diva_free_dma_descriptor (IDI_CALL request, int nr) { 


	(*request)((ENTITY *)pReq);

}