diff --git a/[refs] b/[refs] index fd8d0e33f2a1..442d9587ecea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 99bb25793e4bb8e9b633ea001dd7312b5967385a +refs/heads/master: 6967bd81d883ed325fd58840ee02a8da60458e6b diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig index 6a6a08441804..47c72a63dfe1 100644 --- a/trunk/drivers/net/Kconfig +++ b/trunk/drivers/net/Kconfig @@ -4,9 +4,9 @@ # menu "Network device support" + depends on NET config NETDEVICES - depends on NET default y if UML bool "Network device support" ---help--- @@ -24,9 +24,6 @@ config NETDEVICES If unsure, say Y. -# All the following symbols are dependent on NETDEVICES - do not repeat -# that for each of the symbols. -if NETDEVICES config IFB tristate "Intermediate Functional Block support" @@ -2718,8 +2715,6 @@ config NETCONSOLE If you want to log kernel messages over the network, enable this. See for details. -endif #NETDEVICES - config NETPOLL def_bool NETCONSOLE