Merge branch 'for-upstream/acpi-test' of git://repo.or.cz/linux-2.6/linux-acpi-2...

[pandora-kernel.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index b6a5d45..b986687 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -30,7 +30,7 @@ menu "Networking options"
 config NET_NS
        bool "Network namespace support"
        default n
-       depends on EXPERIMENTAL && !SYSFS
+       depends on EXPERIMENTAL && !SYSFS && NAMESPACES
        help
          Allow user space to create what appear to be multiple instances
          of the network stack.
@@ -45,7 +45,7 @@ config INET
        ---help---
          These are the protocols used on the Internet and on most local
          Ethernets. It is highly recommended to say Y here (this will enlarge
-         your kernel by about 144 KB), since some programs (e.g. the X window
+         your kernel by about 400 KB), since some programs (e.g. the X window
          system) use TCP/IP even if your machine is not connected to any
          other computer. You will get the so-called loopback device which
          allows you to ping yourself (great fun, that!).
@@ -181,6 +181,7 @@ source "net/dccp/Kconfig"
 source "net/sctp/Kconfig"
 source "net/tipc/Kconfig"
 source "net/atm/Kconfig"
+source "net/802/Kconfig"
 source "net/bridge/Kconfig"
 source "net/8021q/Kconfig"
 source "net/decnet/Kconfig"