From patchwork Sun May 2 18:00:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Engelhardt X-Patchwork-Id: 51468 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B1583B7D6A for ; Mon, 3 May 2010 04:00:16 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758383Ab0EBSAJ (ORCPT ); Sun, 2 May 2010 14:00:09 -0400 Received: from borg.medozas.de ([188.40.89.202]:40029 "EHLO borg.medozas.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758334Ab0EBSAH (ORCPT ); Sun, 2 May 2010 14:00:07 -0400 Received: by borg.medozas.de (Postfix, from userid 25121) id C30F3F0A66111; Sun, 2 May 2010 20:00:02 +0200 (CEST) From: Jan Engelhardt To: davem@davemloft.net Cc: netdev@vger.kernel.org Subject: [PATCH] net: fix compile error due to double return type in SOCK_DEBUG Date: Sun, 2 May 2010 20:00:01 +0200 Message-Id: <1272823202-25957-1-git-send-email-jengelh@medozas.de> X-Mailer: git-send-email 1.7.0.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix this one: include/net/sock.h: error: two or more data types in declaration specifiers Signed-off-by: Jan Engelhardt --- include/net/sock.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/net/sock.h b/include/net/sock.h index 56df440..0f0b6d6 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -74,7 +74,7 @@ printk(KERN_DEBUG msg); } while (0) #else /* Validate arguments and do nothing */ -static void inline int __attribute__ ((format (printf, 2, 3))) +static inline void __attribute__ ((format (printf, 2, 3))) SOCK_DEBUG(struct sock *sk, const char *msg, ...) { }