public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Adrian Bunk <bunk@stusta.de>
To: Andrew Morton <akpm@osdl.org>, kkeil@suse.de, kai.germaschewski@gmx.de
Cc: linux-kernel@vger.kernel.org, isdn4linux@listserv.isdn4linux.de
Subject: [patch] 2.6.10-rc2-mm2: ISDN divert_init.c compile error
Date: Thu, 18 Nov 2004 12:36:24 +0100	[thread overview]
Message-ID: <20041118113624.GC4943@stusta.de> (raw)
In-Reply-To: <20041118021538.5764d58c.akpm@osdl.org>

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 */
 /****************************************/


  reply	other threads:[~2004-11-18 11:41 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-11-18 10:15 2.6.10-rc2-mm2 Andrew Morton
2004-11-18 11:36 ` Adrian Bunk [this message]
2004-11-18 12:10 ` 2.6.10-rc2-mm2 Hirokazu Takata
2004-11-18 13:20   ` 2.6.10-rc2-mm2 Hirokazu Takata
2004-11-18 12:42 ` 2.6.10-rc2-mm2 William Lee Irwin III
2004-11-20 11:35   ` [patch] 2.6.10-rc2-mm2: OSS ac97_codec.h: #include pci.h Adrian Bunk
2004-11-20 11:45     ` William Lee Irwin III
2004-11-18 12:45 ` 2.6.10-rc2-mm2 William Lee Irwin III
2004-11-18 13:57 ` 2.6.10-rc2-mm2 William Lee Irwin III
2004-11-18 14:31   ` 2.6.10-rc2-mm2 William Lee Irwin III
2004-11-18 15:41 ` [patch] 2.6.10-rc2-mm2: MTD_XIP dependencies Adrian Bunk
2004-11-18 15:51   ` David Woodhouse
2004-11-18 16:34     ` Nicolas Pitre
2004-11-18 17:02       ` Russell King
2004-11-18 21:32       ` Adrian Bunk
2004-11-18 22:31         ` Nicolas Pitre
2004-11-18 23:25           ` Adrian Bunk
2004-11-19  1:58             ` Nicolas Pitre
2004-11-19 13:35               ` Adrian Bunk
2004-11-19 16:35                 ` Nicolas Pitre
2004-11-21 19:56                   ` Adrian Bunk
2004-11-22  0:38                     ` Nicolas Pitre
2004-11-22  7:38                       ` David Woodhouse
2004-11-18 22:51 ` 2.6.10-rc2-mm2 Valdis.Kletnieks
2004-11-19  0:04 ` [patch] 2.6.10-rc2-mm2: `ST_partstat' multiple definition Adrian Bunk
2004-11-20  2:40 ` 2.6.10-rc2-mm2 Lee Revell
2004-11-20 17:24   ` 2.6.10-rc2-mm2 Lee Revell
2004-11-20 18:31 ` 2.6.10-rc2-mm2 William Lee Irwin III
2004-11-20 21:19   ` 2.6.10-rc2-mm2 Christoph Hellwig
2004-11-20 21:29     ` 2.6.10-rc2-mm2 William Lee Irwin III

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20041118113624.GC4943@stusta.de \
    --to=bunk@stusta.de \
    --cc=akpm@osdl.org \
    --cc=isdn4linux@listserv.isdn4linux.de \
    --cc=kai.germaschewski@gmx.de \
    --cc=kkeil@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox