From patchwork Tue Feb 16 23:30:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 45565 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 902D6B7C48 for ; Wed, 17 Feb 2010 10:30:12 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933408Ab0BPXaB (ORCPT ); Tue, 16 Feb 2010 18:30:01 -0500 Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:53264 "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933267Ab0BPXaA (ORCPT ); Tue, 16 Feb 2010 18:30:00 -0500 Received: from localhost (localhost [127.0.0.1]) by sunset.davemloft.net (Postfix) with ESMTP id 38A1424C10E; Tue, 16 Feb 2010 15:30:15 -0800 (PST) Date: Tue, 16 Feb 2010 15:30:14 -0800 (PST) Message-Id: <20100216.153014.237194043.davem@davemloft.net> To: kaber@trash.net CC: netdev@vger.kernel.org, netfilter-devel@vger.kernel.org Subject: [PATCH]: Sparc netfilter build fix From: David Miller X-Mailer: Mew version 6.3 on Emacs 23.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org I just checked in the following patch to fix the build after this morning's netfilter merge into net-next-2.6 Just FYI... sparc64: Kill bogus ip_tables.h include. Fixes the following build failure: CC arch/sparc/kernel/sys_sparc32.o In file included from include/linux/netfilter_ipv4/ip_tables.h:28, from arch/sparc/kernel/sys_sparc32.c:46: include/linux/netfilter/x_tables.h:525: error: expected declaration specifiers or ‘...’ before ‘nf_hookfn’ Signed-off-by: David S. Miller --- arch/sparc/kernel/sys_sparc32.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) -- 1.6.6.1 diff --git a/arch/sparc/kernel/sys_sparc32.c b/arch/sparc/kernel/sys_sparc32.c index dc0ac19..daded3b 100644 --- a/arch/sparc/kernel/sys_sparc32.c +++ b/arch/sparc/kernel/sys_sparc32.c @@ -43,7 +43,6 @@ #include #include #include -#include #include #include