Hi Marcelo,
This make the static initialisation of some IrDA driver a bit
less broken.
Please apply ;-)
Jean
ir241_static_init.diff :
----------------------
o [CORRECT] fix some obvious static init bugs.
diff -u -p linux/net/irda/irda_device.d0.c linux/net/irda/irda_device.c
--- linux/net/irda/irda_device.d0.c Mon Jun 16 16:57:31 2003
+++ linux/net/irda/irda_device.c Mon Jun 16 17:06:46 2003
@@ -68,6 +68,7 @@ extern int actisys_init(void);
extern int girbil_init(void);
extern int sa1100_irda_init(void);
extern int ep7211_ir_init(void);
+extern int mcp2120_init(void);
static void __irda_task_delete(struct irda_task *task);
@@ -122,6 +123,9 @@ int __init irda_device_init( void)
/*
* Call the init function of the device drivers that has not been
* compiled as a module
+ * Note : non-modular IrDA is not supported in 2.4.X, so don't
+ * waste too much time fixing this code. If you require it, please
+ * upgrade to the IrDA stack in 2.5.X. Jean II
*/
#ifdef CONFIG_IRTTY_SIR
irtty_init();
@@ -135,7 +139,7 @@ int __init irda_device_init( void)
#ifdef CONFIG_NSC_FIR
nsc_ircc_init();
#endif
-#ifdef CONFIG_TOSHIBA_FIR
+#ifdef CONFIG_TOSHIBA_OLD
toshoboe_init();
#endif
#ifdef CONFIG_SMC_IRCC_FIR
@@ -161,6 +165,9 @@ int __init irda_device_init( void)
#endif
#ifdef CONFIG_EP7211_IR
ep7211_ir_init();
+#endif
+#ifdef CONFIG_MCP2120_DONGLE
+ mcp2120_init();
#endif
return 0;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Mon Jun 23 2003 - 22:00:42 EST