Patchwork : Sparc netfilter build fix

login
register
mail settings
Submitter David Miller
Date Feb. 16, 2010, 11:30 p.m.
Message ID <20100216.153014.237194043.davem@davemloft.net>
Download mbox | patch
Permalink /patch/45565/
State Accepted
Delegated to: David Miller
Headers show

Comments

David Miller - Feb. 16, 2010, 11:30 p.m.
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 <davem@davemloft.net>

---
 arch/sparc/kernel/sys_sparc32.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

-- 
1.6.6.1

Patch

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>