Subject: Re: linux-next: build failure after final merge (net tree)

From: David Miller <[email-masked]>
Date: Tue, 16 Feb 2010 23:11:09 -0800 (PST)

From: Stephen Rothwell <[email-masked]>
Date: Wed, 17 Feb 2010 17:40:15 +1100

> After merging, today's linux-next build (sparc64 defconfig) failed like
> this:

Fixed for at least 6 hours:

From 177867ce08f2756fa361e37086fc1792d7b4cf29 Mon Sep 17 00:00:00 2001
From: David S. Miller <[email-masked]>
Date: Tue, 16 Feb 2010 15:23:23 -0800
Subject: [PATCH 641/698] sparc64: Kill bogus ip_tables.h include.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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 <[email-masked]>
---
 arch/sparc/kernel/sys_sparc32.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

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 <linux/security.h>
 #include <linux/compat.h>
 #include <linux/vfs.h>
-#include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/ptrace.h>
 
 #include <asm/types.h>
-- 
1.6.6.1