---

yaml --- r: 287515 b: refs/heads/master c: da09128 h: refs/heads/master i: 287513: 9d6ff94 287511: 40ae308 v: v3
git-mirror · Feb 7, 2012 · 9e86efb · 9e86efb
1 parent 2800ce4
commit 9e86efb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aadf1f0fc851d71095d2773bcda73e1423e6b730
+refs/heads/master: da0912868527913eba15f5ebcfb420b32a037f1a
diff --git a/trunk/drivers/net/tokenring/Kconfig b/trunk/drivers/net/tokenring/Kconfig
@@ -7,7 +7,6 @@ menuconfig TR
 	bool "Token Ring driver support"
 	depends on NETDEVICES && !UML
 	depends on (PCI || ISA || MCA || CCW || PCMCIA)
-	select LLC
 	help
 	  Token Ring is IBM's way of communication on a local network; the
 	  rest of the world uses Ethernet. To participate on a Token Ring
@@ -20,6 +19,10 @@ menuconfig TR
 
 if TR
 
+config WANT_LLC
+	def_bool y
+	select LLC
+
 config PCMCIA_IBMTR
 	tristate "IBM PCMCIA tokenring adapter support"
 	depends on IBMTR!=y && PCMCIA