merge up to iptables 1.3.8 with a basic set of extensions

[iptables.git] / ipset / ipset_portmap.c

diff --git a/ipset/ipset_portmap.c b/ipset/ipset_portmap.c
index cdad439..1d4f807 100644 (file)
--- a/ipset/ipset_portmap.c
+++ b/ipset/ipset_portmap.c
@@ -21,10 +21,6 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#ifndef __always_inline
-#define __always_inline inline
-#endif
-#include <asm/bitops.h>
 
 #include <linux/netfilter_ipv4/ip_set_portmap.h>
 #include "ipset.h"