From 1dd3fe798de4ddcdcb9352b19e3aa4154e538c1a Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Mon, 22 Sep 2014 13:51:59 +0000 Subject: [PATCH] topconfig: Reenable renamed IP_NF_NAT. Signed-off-by: maximilian attems svn path=/dists/trunk/linux/; revision=21894 --- debian/changelog | 2 ++ debian/config/config | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 30322a4a8..f84a2843f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Thu, 18 Sep 2014 23:50:00 +0200 + linux (3.17~rc5-1~exp1) experimental; urgency=medium * New upstream release candidate diff --git a/debian/config/config b/debian/config/config index add966b52..379bd6b88 100644 --- a/debian/config/config +++ b/debian/config/config @@ -5535,7 +5535,7 @@ CONFIG_IP_NF_FILTER=m 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