topconfig: Reenable renamed IP_NF_NAT.

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

svn path=/dists/trunk/linux/; revision=21894
This commit is contained in:
Maximilian Attems 2014-09-22 13:51:59 +00:00
parent 0d47c97a80
commit 1dd3fe798d
2 changed files with 3 additions and 1 deletions

2
debian/changelog vendored
View File

@ -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@debian.org> Thu, 18 Sep 2014 23:50:00 +0200
linux (3.17~rc5-1~exp1) experimental; urgency=medium
* New upstream release candidate

View File

@ -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