dongles-12_dup_symbols
PATCH 1/1 dongles-12_dup_symbols
ir263_dongles-12_dup_symbols.diff :
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
o [FEATURE] rename dongle entry points for consistency
drivers/net/irda/act200l-sir.c renamed from drivers/net/irda.d9/act200l-sir.c +4 -4
@@ -93,12 +93,12 @@ static struct dongle_driver act200l = { .set_speed = act200l_change_speed, }; -static int __init act200l_init (void ) +static int __init act200l_sir_init (void ) {return irda_register_dongle (&act200l); } -static void __exit act200l_cleanup(void) +static void __exit act200l_sir_cleanup(void) {irda_unregister_dongle (&act200l); }
@@ -254,5 +254,5 @@ MODULE_DESCRIPTION("ACTiSYS ACT-IR200L dMODULE_LICENSE ("GPL" );MODULE_ALIAS ("irda-dongle-10" );/* IRDA_ACT200L_DONGLE */ -module_init (act200l_init); -module_exit (act200l_cleanup); +module_init (act200l_sir_init); +module_exit (act200l_sir_cleanup);
drivers/net/irda/girbil-sir.c renamed from drivers/net/irda.d9/girbil-sir.c +4 -4
@@ -72,12 +72,12 @@ static struct dongle_driver girbil = { .set_speed = girbil_change_speed, }; -static int __init girbil_init (void ) +static int __init girbil_sir_init (void ) {return irda_register_dongle (&girbil); } -static void __exit girbil_cleanup(void) +static void __exit girbil_sir_cleanup(void) {irda_unregister_dongle (&girbil); }
@@ -254,5 +254,5 @@ MODULE_DESCRIPTION("Greenwich GIrBIL donMODULE_LICENSE ("GPL" );MODULE_ALIAS ("irda-dongle-4" );/* IRDA_GIRBIL_DONGLE */ -module_init (girbil_init); -module_exit (girbil_cleanup); +module_init (girbil_sir_init); +module_exit (girbil_sir_cleanup);
drivers/net/irda/mcp2120-sir.c renamed from drivers/net/irda.d9/mcp2120-sir.c +4 -4
@@ -49,12 +49,12 @@ static struct dongle_driver mcp2120 = { .set_speed = mcp2120_change_speed, }; -static int __init mcp2120_init (void ) +static int __init mcp2120_sir_init (void ) {return irda_register_dongle (&mcp2120); } -static void __exit mcp2120_cleanup(void) +static void __exit mcp2120_sir_cleanup(void) {irda_unregister_dongle (&mcp2120); }
@@ -226,5 +226,5 @@ MODULE_DESCRIPTION("Microchip MCP2120");MODULE_LICENSE ("GPL" );MODULE_ALIAS ("irda-dongle-9" );/* IRDA_MCP2120_DONGLE */ -module_init (mcp2120_init); -module_exit (mcp2120_cleanup); +module_init (mcp2120_sir_init); +module_exit (mcp2120_sir_cleanup);
drivers/net/irda/old_belkin-sir.c renamed from drivers/net/irda.d9/old_belkin-sir.c +4 -4
@@ -78,12 +78,12 @@ static struct dongle_driver old_belkin = .set_speed = old_belkin_change_speed, }; -static int __init old_belkin_init (void ) +static int __init old_belkin_sir_init (void ) {return irda_register_dongle (&old_belkin); } -static void __exit old_belkin_cleanup(void) +static void __exit old_belkin_sir_cleanup(void) {irda_unregister_dongle (&old_belkin); }
@@ -152,5 +152,5 @@ MODULE_DESCRIPTION("Belkin (old) SmartBeMODULE_LICENSE ("GPL" );MODULE_ALIAS ("irda-dongle-7" );/* IRDA_OLD_BELKIN_DONGLE */ -module_init (old_belkin_init); -module_exit (old_belkin_cleanup); +module_init (old_belkin_sir_init); +module_exit (old_belkin_sir_cleanup);