From: Adrian Bunk Date: Sat, 3 Feb 2007 03:33:52 +0000 (-0800) Subject: [NETFILTER]: nf_conntrack_h323: fix compile error with CONFIG_IPV6=m, CONFIG_NF_CONNT... X-Git-Tag: v2.6.20~11 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3e8219806c33b64a00b0013f96f735451f30c64c;p=linux-2.6-omap-h63xx.git [NETFILTER]: nf_conntrack_h323: fix compile error with CONFIG_IPV6=m, CONFIG_NF_CONNTRACK_H323=y Fix this by letting NF_CONNTRACK_H323 depend on (IPV6 || IPV6=n). Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller --- diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index 2a2bcb303bf..80107d4909c 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -165,7 +165,7 @@ config NF_CONNTRACK_FTP config NF_CONNTRACK_H323 tristate "H.323 protocol support (EXPERIMENTAL)" - depends on EXPERIMENTAL && NF_CONNTRACK + depends on EXPERIMENTAL && NF_CONNTRACK && (IPV6 || IPV6=n) help H.323 is a VoIP signalling protocol from ITU-T. As one of the most important VoIP protocols, it is widely used by voice hardware and