Merge tag 'v3.3-rc7' into x86/mce

Merge reason: Update from an ancient -rc1 base to an almost-final stable kernel.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/net/tokenring/Kconfig b/drivers/net/tokenring/Kconfig
index c7e0149d1514..45550d42b368 100644
--- a/drivers/net/tokenring/Kconfig
+++ b/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