Re: Linux 2.4.15-pre4 - merge with Alan

Martin Dalecki (dalecki@evision-ventures.com)
Mon, 12 Nov 2001 21:09:46 +0100

I just scrolled one line firther down and
noticed the same problem for ep7211_ir_init
as for sa1100_irda_init. Citing form the corrover patch
between pre-patches you can easly see:

+++ linux/net/irda/irda_device.c Fri Nov 9 14:22:17 2001
++++ linux/net/irda/irda_device.c Sun Nov 11 10:20:21 2001
@@ -10,6 +10,7 @@
* Modified by: Dag Brattli <dagb@cs.uit.no>
*
@@ -140040,27 +184071,33 @@

static void __irda_task_delete(struct irda_task *task);

-@@ -124,6 +127,9 @@
+@@ -124,6 +127,12 @@
#ifdef CONFIG_WINBOND_FIR
w83977af_init();
#endif
+#ifdef CONFIG_SA1100_FIR
+ sa1100_irda_init();
+#endif
++#ifdef CONFIG_SA1100_FIR
++ sa1100_irda_init();
++#endif
#ifdef CONFIG_NSC_FIR
nsc_ircc_init();
#endif
-@@ -151,6 +157,9 @@
+@@ -151,6 +160,12 @@
#ifdef CONFIG_OLD_BELKIN
old_belkin_init();
#endif
+#ifdef CONFIG_EP7211_IR
+ ep7211_ir_init();
+#endif
++#ifdef CONFIG_EP7211_IR
++ ep7211_ir_init();
++#endif
return 0;
}

-@@ -181,7 +190,10 @@

Supposedly there is still room for -pre5 ;-).
-
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/