Merge git://oss.sgi.com:8090/xfs/xfs-2.6

[powerpc.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index 867f950..9156578 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -37,6 +37,7 @@ config NETDEBUG
 source "net/packet/Kconfig"
 source "net/unix/Kconfig"
 source "net/xfrm/Kconfig"
+source "net/iucv/Kconfig"
 
 config INET
        bool "TCP/IP networking"
@@ -75,7 +76,7 @@ config NETWORK_SECMARK
          If you are unsure how to answer this question, answer N.
 
 menuconfig NETFILTER
-       bool "Network packet filtering (replaces ipchains)"
+       bool "Network packet filtering framework (Netfilter)"
        ---help---
          Netfilter is a framework for filtering and mangling network packets
          that pass through your Linux box.