From: Patrick McHardy <kaber@trash.net>
Date: Sun, 4 Mar 2007 23:57:25 +0000 (-0800)
Subject: [NETFILTER]: nf_conntrack/nf_nat: fix incorrect config ifdefs
X-Git-Tag: v2.6.21-rc3~2^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e281db5cdfc3ab077ab3e459d098cb4fde0bc57a;p=pandora-kernel.git

[NETFILTER]: nf_conntrack/nf_nat: fix incorrect config ifdefs

The nf_conntrack_netlink config option is named CONFIG_NF_CT_NETLINK,
but multiple files use CONFIG_IP_NF_CONNTRACK_NETLINK or
CONFIG_NF_CONNTRACK_NETLINK for ifdefs.

Fix this and reformat all CONFIG_NF_CT_NETLINK ifdefs to only use a line.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

Reading git-diff-tree failed