From 9e86efbccbb463da2962c5307463fd60f5c0fb5d Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sat, 4 Feb 2012 20:31:39 +0000 Subject: [PATCH] --- yaml --- r: 287515 b: refs/heads/master c: da0912868527913eba15f5ebcfb420b32a037f1a h: refs/heads/master i: 287513: 9d6ff944e169c7beba8bf2dd7c01276690b6e4fb 287511: 40ae3081e16e4b3d07899a6c0565ab1c2dd236cf v: v3 --- [refs] | 2 +- trunk/drivers/net/tokenring/Kconfig | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5f1eb12c3752..247928fee1db 100644 --- 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 index c7e0149d1514..45550d42b368 100644 --- 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