Messages in this thread Patch in this message | | | Date | Thu, 18 Nov 2004 12:36:24 +0100 | From | Adrian Bunk <> | Subject | [patch] 2.6.10-rc2-mm2: ISDN divert_init.c compile error |
| |
The following compile error comes from Linus' tree:
<-- snip -->
... CC drivers/isdn/divert/divert_init.o drivers/isdn/divert/divert_init.c:25: error: conflicting types for 'printk' include/linux/kernel.h:106: error: previous declaration of 'printk' was here drivers/isdn/divert/divert_init.c:25: error: conflicting types for 'printk' include/linux/kernel.h:106: error: previous declaration of 'printk' was here make[3]: *** [drivers/isdn/divert/divert_init.o] Error 1
<-- snip -->
The fix is simple:
Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
--- linux-2.6.10-rc2-mm2-full/drivers/isdn/divert/divert_init.c.old 2004-11-18 12:28:11.000000000 +0100 +++ linux-2.6.10-rc2-mm2-full/drivers/isdn/divert/divert_init.c 2004-11-18 12:31:08.000000000 +0100 @@ -12,6 +12,7 @@ #include <linux/module.h> #include <linux/version.h> #include <linux/init.h> +#include <linux/kernel.h> #include "isdn_divert.h" @@ -19,11 +20,6 @@ MODULE_AUTHOR("Werner Cornelius"); MODULE_LICENSE("GPL"); -/********************/ -/* needed externals */ -/********************/ -extern int printk(const char *fmt,...); - /****************************************/ /* structure containing interface to hl */ /****************************************/ - 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/
| |