- revert, mistake

Changed files:
    kernel-addon.config -> 1.45
    kernel-netfilter.config -> 1.32
    kernel-sparc-smp.config -> 1.38
    kernel-sparc.config -> 1.37
    kernel-sparc64-smp.config -> 1.46
    kernel-sparc64.config -> 1.48

diff --git a/kernel-addon.config b/kernel-addon.config
index 1e5d1b3e8f3520945f61607b0fc66f4e83fa8258..c6fa64cd5e19ed4505351ba46e0df27900469155 100644 (file)
--- a/kernel-addon.config
+++ b/kernel-addon.config
@@ -65,7 +65,6 @@ CONFIG_IP_VS_FTP=m
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
 CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_IPF=m

diff --git a/kernel-netfilter.config b/kernel-netfilter.config
index 5f3288971a525dea9aa3e803eadb27a8d5a0cfe1..47ade7351b777d72f724662ac86482989861a75c 100644 (file)
--- a/kernel-netfilter.config
+++ b/kernel-netfilter.config
@@ -23,7 +23,6 @@ CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_RAW=m
 CONFIG_IP_NF_MATCH_RPC=m
 CONFIG_IP_NF_MATCH_LIMIT=m
-CONFIG_IP_NF_MATCH_IPRANGE=m
 CONFIG_IP_NF_MATCH_QUOTA=m
 CONFIG_IP_NF_POOL=m
 # CONFIG_IP_POOL_STATISTICS is not set
@@ -72,15 +71,12 @@ CONFIG_IP_NF_NAT=m
 CONFIG_IP_NF_NAT_NEEDED=y
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_SAME=m
 CONFIG_IP_NF_NAT_TALK=m
 CONFIG_IP_NF_NAT_H323=m
 CONFIG_IP_NF_NAT_PPTP=m
 CONFIG_IP_NF_NAT_PROTO_GRE=m
 CONFIG_IP_NF_TARGET_SAME=m
 CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_SAME=m
 CONFIG_IP_NF_NAT_AMANDA=m
 CONFIG_IP_NF_NAT_LOCAL=y
 CONFIG_IP_NF_NAT_SNMP_BASIC=m
@@ -95,7 +91,6 @@ CONFIG_IP_NF_TARGET_TOS=m
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_DSCP=m
 CONFIG_IP_NF_TARGET_MARK=m
-CONFIG_IP_NF_TARGET_CLASSIFY=m
 CONFIG_IP_NF_TARGET_IPMARK=m
 CONFIG_IP_NF_TARGET_IMQ=m
 CONFIG_IP_NF_TARGET_CLASSIFY=m

diff --git a/kernel-sparc-smp.config b/kernel-sparc-smp.config
index dc2351c6f7f6ba57badd7c5245f8ea272e844c26..d4602749808965c6621f8f3362ea2f8fb842159a 100644 (file)
--- a/kernel-sparc-smp.config
+++ b/kernel-sparc-smp.config
@@ -165,7 +165,6 @@ CONFIG_PACKET_MMAP=y
 CONFIG_NETLINK_DEV=m
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
-CONFIG_BRIDGE_NETFILTER=y
 CONFIG_FILTER=y
 CONFIG_UNIX=m
 CONFIG_INET=y

diff --git a/kernel-sparc.config b/kernel-sparc.config
index 35e54d8c203cefd05f3bace7408f1aa14dcb895c..e2e71903f4a16cf49bba7de4e898b2b5d3edbaf8 100644 (file)
--- a/kernel-sparc.config
+++ b/kernel-sparc.config
@@ -165,7 +165,6 @@ CONFIG_PACKET_MMAP=y
 CONFIG_NETLINK_DEV=m
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
-CONFIG_BRIDGE_NETFILTER=y
 CONFIG_FILTER=y
 CONFIG_UNIX=m
 CONFIG_INET=y

diff --git a/kernel-sparc64-smp.config b/kernel-sparc64-smp.config
index f6b04d8ef61d4003d19d356133dd7f1811c2b023..14b2bb6543fe187cdd60793fc3ad6dee5d340c5d 100644 (file)
--- a/kernel-sparc64-smp.config
+++ b/kernel-sparc64-smp.config
@@ -310,7 +310,6 @@ CONFIG_PACKET_MMAP=y
 CONFIG_NETLINK_DEV=m
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
-CONFIG_BRIDGE_NETFILTER=y
 CONFIG_FILTER=y
 CONFIG_UNIX=m
 CONFIG_INET=y
@@ -405,7 +404,6 @@ CONFIG_BRIDGE=m
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
 CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_IPF=m

diff --git a/kernel-sparc64.config b/kernel-sparc64.config
index 7b14ecd75b2b5876bc0c89fb4d977470be80aa1c..d8ef37ee67b1ad12c1e8d48e3c768edf312a9594 100644 (file)
--- a/kernel-sparc64.config
+++ b/kernel-sparc64.config
@@ -310,7 +310,6 @@ CONFIG_PACKET_MMAP=y
 CONFIG_NETLINK_DEV=m
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
-CONFIG_BRIDGE_NETFILTER=y
 CONFIG_FILTER=y
 CONFIG_UNIX=m
 CONFIG_INET=y
@@ -405,7 +404,6 @@ CONFIG_BRIDGE=m
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
 CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_IPF=m