aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2007-02-02 22:33:52 -0500
committerDavid S. Miller <davem@davemloft.net>2007-02-02 22:33:52 -0500
commit3e8219806c33b64a00b0013f96f735451f30c64c (patch)
treee0e802f56c9432e11642e47696aeb7fa9e620179
parent40e0cb004a6d4a7ad577724e451e8dbd6cba5a89 (diff)
[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 <bunk@stusta.de> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/netfilter/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 2a2bcb303bfa..80107d4909c5 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -165,7 +165,7 @@ config NF_CONNTRACK_FTP
165 165
166config NF_CONNTRACK_H323 166config NF_CONNTRACK_H323
167 tristate "H.323 protocol support (EXPERIMENTAL)" 167 tristate "H.323 protocol support (EXPERIMENTAL)"
168 depends on EXPERIMENTAL && NF_CONNTRACK 168 depends on EXPERIMENTAL && NF_CONNTRACK && (IPV6 || IPV6=n)
169 help 169 help
170 H.323 is a VoIP signalling protocol from ITU-T. As one of the most 170 H.323 is a VoIP signalling protocol from ITU-T. As one of the most
171 important VoIP protocols, it is widely used by voice hardware and 171 important VoIP protocols, it is widely used by voice hardware and