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

[Martin Michlmayr]

Author: tbm
Date: Mon Dec 11 17:45:41 2006
New Revision: 7962

Modified:
   dists/sid/linux-2.6/debian/arch/arm/config.iop32x
   dists/sid/linux-2.6/debian/changelog
Log:
arm/iop32x: Enable CONFIG_IP_NF_CONNTRACK_EVENTS and _NETLINK.


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:45:41 2006
@@ -315,8 +315,8 @@
 CONFIG_IP_NF_CONNTRACK=m
 CONFIG_IP_NF_CT_ACCT=y
 CONFIG_IP_NF_CONNTRACK_MARK=y
-# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
-# CONFIG_IP_NF_CONNTRACK_NETLINK is not set
+CONFIG_IP_NF_CONNTRACK_EVENTS=y
+CONFIG_IP_NF_CONNTRACK_NETLINK=m
 # CONFIG_IP_NF_CT_PROTO_SCTP is not set
 CONFIG_IP_NF_FTP=m
 CONFIG_IP_NF_IRC=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:45:41 2006
@@ -1,3 +1,9 @@
+linux-2.6 (2.6.18-9) UNRELEASED; urgency=low
+
+  * arm/iop32x: Enable CONFIG_IP_NF_CONNTRACK_EVENTS and _NETLINK.
+
+ -- Martin Michlmayr <tbm at cyrius.com>  Mon, 11 Dec 2006 16:45:16 +0000
+
 linux-2.6 (2.6.18-8) unstable; urgency=low
 
   * Fix relations in the generated control file. (closes: #400544)