From fe5099227ff768f5e02fcc5c5da7b2ecc0c598bc Mon Sep 17 00:00:00 2001
From: WANG Cong <xiyou.wangcong@gmail.com>
Date: Wed, 29 Feb 2012 04:05:41 +0100
Subject: [PATCH] --- yaml --- r: 290811 b: refs/heads/master c:
 5f1f815103eb13823d34875807c1710b8e2b0f09 h: refs/heads/master i:   290809:
 c5777f9fbcfab9af63761e99fae27b5f2a67e01f   290807:
 653b9ca88ad41b99f744e5f5c0c50bf2945c1564 v: v3

---
 [refs]                                        |  2 +-
 trunk/include/linux/netfilter_ipv4/Kbuild     |  2 --
 trunk/include/linux/netfilter_ipv4/ipt_SAME.h | 20 -------------------
 .../include/linux/netfilter_ipv4/ipt_realm.h  |  7 -------
 4 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 trunk/include/linux/netfilter_ipv4/ipt_SAME.h
 delete mode 100644 trunk/include/linux/netfilter_ipv4/ipt_realm.h

diff --git a/[refs] b/[refs]
index 76fcf77d4b77..708e71bc8ec8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58020f77612747271ffa13e63cbff6ba12f49c2e
+refs/heads/master: 5f1f815103eb13823d34875807c1710b8e2b0f09
diff --git a/trunk/include/linux/netfilter_ipv4/Kbuild b/trunk/include/linux/netfilter_ipv4/Kbuild
index f9930c87fff3..31f8bec95650 100644
--- a/trunk/include/linux/netfilter_ipv4/Kbuild
+++ b/trunk/include/linux/netfilter_ipv4/Kbuild
@@ -4,11 +4,9 @@ header-y += ipt_CLUSTERIP.h
 header-y += ipt_ECN.h
 header-y += ipt_LOG.h
 header-y += ipt_REJECT.h
-header-y += ipt_SAME.h
 header-y += ipt_TTL.h
 header-y += ipt_ULOG.h
 header-y += ipt_addrtype.h
 header-y += ipt_ah.h
 header-y += ipt_ecn.h
-header-y += ipt_realm.h
 header-y += ipt_ttl.h
diff --git a/trunk/include/linux/netfilter_ipv4/ipt_SAME.h b/trunk/include/linux/netfilter_ipv4/ipt_SAME.h
deleted file mode 100644
index 5bca78267afd..000000000000
--- a/trunk/include/linux/netfilter_ipv4/ipt_SAME.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _IPT_SAME_H
-#define _IPT_SAME_H
-
-#include <linux/types.h>
-
-#define IPT_SAME_MAX_RANGE	10
-
-#define IPT_SAME_NODST		0x01
-
-struct ipt_same_info {
-	unsigned char info;
-	__u32 rangesize;
-	__u32 ipnum;
-	__u32 *iparray;
-
-	/* hangs off end. */
-	struct nf_nat_range range[IPT_SAME_MAX_RANGE];
-};
-
-#endif /*_IPT_SAME_H*/
diff --git a/trunk/include/linux/netfilter_ipv4/ipt_realm.h b/trunk/include/linux/netfilter_ipv4/ipt_realm.h
deleted file mode 100644
index b3996eaa0188..000000000000
--- a/trunk/include/linux/netfilter_ipv4/ipt_realm.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _IPT_REALM_H
-#define _IPT_REALM_H
-
-#include <linux/netfilter/xt_realm.h>
-#define ipt_realm_info xt_realm_info
-
-#endif /* _IPT_REALM_H */