[kernel] r21894 - in dists/trunk/linux/debian: . config

[Maximilian Attems]

Author: maks
Date: Mon Sep 22 13:51:59 2014
New Revision: 21894

Log:
topconfig: Reenable renamed IP_NF_NAT.

Signed-off-by: maximilian attems <maks at debian.org>

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/config

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Mon Sep 22 00:05:44 2014	(r21893)
+++ dists/trunk/linux/debian/changelog	Mon Sep 22 13:51:59 2014	(r21894)
@@ -1,8 +1,10 @@
 linux (3.17~rc5-l~exp2) UNRELEASED; urgency=medium
 
   * armel: Drop ixp4xx image.
+  * topconfig: Reenable renamed IP_NF_NAT. (closes #762458)
 
  -- maximilian attems <maks at debian.org>  Thu, 18 Sep 2014 23:50:00 +0200
+
 linux (3.17~rc5-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate

Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config	Mon Sep 22 00:05:44 2014	(r21893)
+++ dists/trunk/linux/debian/config/config	Mon Sep 22 13:51:59 2014	(r21894)
@@ -5535,7 +5535,7 @@
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_SYNPROXY=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT_IPV4=m
+CONFIG_IP_NF_NAT=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m