commit 694a464e19b9e3278dbaf6a09fa7c1efec3f8eb5
author Al Viro <viro@zeniv.linux.org.uk> Fri Mar 31 02:30:14 2006 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> Fri Mar 31 12:18:51 2006 -0800
tree 17a73dc929eaf3ace846b5b0dbe8165e4285d901
parent cc70a40b5ee05e5cca053887fc447590307bf1e8

[PATCH] uml: kconfigs

kconfig sanitized around drivers/net

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

drivers/net/tokenring/Kconfig

diff --git a/drivers/net/tokenring/Kconfig b/drivers/net/tokenring/Kconfig
index e4cfc80..99c4c19 100644
--- a/drivers/net/tokenring/Kconfig
+++ b/drivers/net/tokenring/Kconfig
@@ -3,7 +3,7 @@
 #
 
 menu "Token Ring devices"
-	depends on NETDEVICES
+	depends on NETDEVICES && !UML
 
 # So far, we only have PCI, ISA, and MCA token ring devices
 config TR