From patchwork Wed Feb 10 15:08:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Linus_L=C3=BCssing?= X-Patchwork-Id: 8 Return-Path: Received: from fmmailgate03.web.de (fmmailgate03.web.de [217.72.192.234]) by open-mesh.net (Postfix) with ESMTP id 293BE154311 for ; Wed, 10 Feb 2010 16:31:47 +0100 (CET) Received: from smtp05.web.de (fmsmtp05.dlan.cinetic.de [172.20.4.166]) by fmmailgate03.web.de (Postfix) with ESMTP id 5922713D7FDA8; Wed, 10 Feb 2010 16:08:58 +0100 (CET) Received: from [85.179.232.33] (helo=localhost) by smtp05.web.de with asmtp (TLSv1:AES128-SHA:128) (WEB.DE 4.110 #314) id 1NfEBV-0002Fu-00; Wed, 10 Feb 2010 16:08:57 +0100 From: =?UTF-8?q?Linus=20L=C3=BCssing?= To: b.a.t.m.a.n@lists.open-mesh.org Date: Wed, 10 Feb 2010 16:08:26 +0100 Message-Id: <1265814507-29885-1-git-send-email-linus.luessing@web.de> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <20100210131150.GE2900@lunn.ch> References: <20100210131150.GE2900@lunn.ch> MIME-Version: 1.0 Sender: linus.luessing@web.de X-Sender: linus.luessing@web.de X-Provags-ID: V01U2FsdGVkX1/OTFHafO/dM44Uvl6NOubXSdYTv/gA+k3d3OQF PpfHyWB+wYBaE/pqrzFFbppGJkVNlekdIIG+91kezCGn+XpnhP s8XJcL8O//gXOV/7t/6Q== Subject: [B.A.T.M.A.N.] [PATCH 1/2] batman-adv: use original printk in bat_printk X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Feb 2010 15:31:47 -0000 bat_printk is calling a printk which got previously substituted because of the define in compat.h. This patch removes the define for the scope of bat_printk.c. Signed-off-by: Linus Lüssing Signed-off-by: Andrew Lunn --- bat_printk.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/bat_printk.c b/bat_printk.c index a55eff3..845391d 100644 --- a/bat_printk.c +++ b/bat_printk.c @@ -35,6 +35,12 @@ /* Works only for digits and letters, but small and fast */ #define TOLOWER(x) ((x) | 0x20) +/* We don't want to recursively call bat_printk here + because of the previous define in compat.h */ +#ifdef printk +#undef printk +#endif + static int skip_atoi(const char **s) { int i = 0;