[kernel] r7961 - in dists/sid/linux-2.6/debian: . arch/arm

[Martin Michlmayr]

Author: tbm
Date: Mon Dec 11 17:22:57 2006
New Revision: 7961

Modified:
   dists/sid/linux-2.6/debian/arch/arm/config.iop32x
   dists/sid/linux-2.6/debian/changelog
Log:
revert my config changes since it apparently changes the abi


Modified: dists/sid/linux-2.6/debian/arch/arm/config.iop32x
==============================================================================
--- dists/sid/linux-2.6/debian/arch/arm/config.iop32x	(original)
+++ dists/sid/linux-2.6/debian/arch/arm/config.iop32x	Mon Dec 11 17:22:57 2006
@@ -288,7 +288,6 @@
 CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_SECMARK=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
@@ -316,17 +315,16 @@
 CONFIG_IP_NF_CONNTRACK=m
 CONFIG_IP_NF_CT_ACCT=y
 CONFIG_IP_NF_CONNTRACK_MARK=y
-CONFIG_IP_NF_CONNTRACK_SECMARK=y
-CONFIG_IP_NF_CONNTRACK_EVENTS=y
-CONFIG_IP_NF_CONNTRACK_NETLINK=m
-CONFIG_IP_NF_CT_PROTO_SCTP=m
+# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
+# CONFIG_IP_NF_CONNTRACK_NETLINK is not set
+# CONFIG_IP_NF_CT_PROTO_SCTP is not set
 CONFIG_IP_NF_FTP=m
 CONFIG_IP_NF_IRC=m
-CONFIG_IP_NF_NETBIOS_NS=m
+# CONFIG_IP_NF_NETBIOS_NS is not set
 CONFIG_IP_NF_TFTP=m
 CONFIG_IP_NF_AMANDA=m
 CONFIG_IP_NF_PPTP=m
-CONFIG_IP_NF_H323=m
+# CONFIG_IP_NF_H323 is not set
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_IPRANGE=m
@@ -356,8 +354,6 @@
 CONFIG_IP_NF_NAT_TFTP=m
 CONFIG_IP_NF_NAT_AMANDA=m
 CONFIG_IP_NF_NAT_PPTP=m
-CONFIG_IP_NF_NAT_H323=m
-CONFIG_IP_NF_NAT_SIP=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_TARGET_TOS=m
 CONFIG_IP_NF_TARGET_ECN=m

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Mon Dec 11 17:22:57 2006
@@ -1,11 +1,3 @@
-linux-2.6 (2.6.18-9) UNRELEASED; urgency=low
-
-  [ Martin Michlmayr ]
-  * arm/iop32x: Enable CONFIG_IP_NF_CONNTRACK_NETLINK and some similar
-    modules.
-
- -- Martin Michlmayr <tbm at cyrius.com>  Mon, 11 Dec 2006 15:43:15 +0000
-
 linux-2.6 (2.6.18-8) unstable; urgency=low
 
   * Fix relations in the generated control file. (closes: #400544)