Merge tag 'regmap-domain-deps' of git://git.kernel.org/pub/scm/linux/kernel/git/broon...

[cascardo/linux.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index b982854..0c2bd80 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -66,10 +66,7 @@ config DUMMY
          <http://www.tldp.org/docs.html#guide>.
 
          To compile this driver as a module, choose M here: the module
-         will be called dummy.  If you want to use more than one dummy
-         device at a time, you need to compile this driver as a module.
-         Instead of 'dummy', the devices will then be called 'dummy0',
-         'dummy1' etc.
+         will be called dummy.
 
 config EQUALIZER
        tristate "EQL (serial line load balancing) support"
@@ -285,8 +282,6 @@ source "drivers/net/slip/Kconfig"
 
 source "drivers/s390/net/Kconfig"
 
-source "drivers/net/tokenring/Kconfig"
-
 source "drivers/net/usb/Kconfig"
 
 source "drivers/net/wireless/Kconfig"