From 2762062c1e31a1a975c8d987fd7b9293baef2e14 Mon Sep 17 00:00:00 2001
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Mon, 22 Aug 2011 17:37:03 -0700
Subject: [PATCH] --- yaml --- r: 265579 b: refs/heads/master c:
 c0153225a0e86013b8b8267ffd94e5484d83b916 h: refs/heads/master i:   265577:
 5b83413f894349d5da6a59baa1dd5cb5b628f0b5   265575:
 20fe7b07f44fea13ea1a354f84bf4c999c78ca62 v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/net/pcmcia/Kconfig              | 11 ----------
 trunk/drivers/net/pcmcia/Makefile             |  2 --
 trunk/drivers/net/tokenring/Kconfig           | 13 +++++++++++-
 trunk/drivers/net/tokenring/Makefile          | 21 ++++++++++---------
 .../net/{pcmcia => tokenring}/ibmtr_cs.c      |  2 +-
 6 files changed, 25 insertions(+), 26 deletions(-)
 rename trunk/drivers/net/{pcmcia => tokenring}/ibmtr_cs.c (99%)

diff --git a/[refs] b/[refs]
index ab409b6bba61..63b9494c8031 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5451d783ade99308dfccdf5ca284ed07affa4ff
+refs/heads/master: c0153225a0e86013b8b8267ffd94e5484d83b916
diff --git a/trunk/drivers/net/pcmcia/Kconfig b/trunk/drivers/net/pcmcia/Kconfig
index 12e7ae47c066..ff4deb0ace4d 100644
--- a/trunk/drivers/net/pcmcia/Kconfig
+++ b/trunk/drivers/net/pcmcia/Kconfig
@@ -31,15 +31,4 @@ config ARCNET_COM20020_CS
 	  To compile this driver as a module, choose M here: the module will be
 	  called com20020_cs.  If unsure, say N.
 
-config PCMCIA_IBMTR
-	tristate "IBM PCMCIA tokenring adapter support"
-	depends on IBMTR!=y && TR
-	help
-	  Say Y here if you intend to attach this type of Token Ring PCMCIA
-	  card to your computer. You then also need to say Y to "Token Ring
-	  driver support".
-
-	  To compile this driver as a module, choose M here: the module will be
-	  called ibmtr_cs.
-
 endif # NET_PCMCIA
diff --git a/trunk/drivers/net/pcmcia/Makefile b/trunk/drivers/net/pcmcia/Makefile
index 618e81667ca0..b98a0a4753fa 100644
--- a/trunk/drivers/net/pcmcia/Makefile
+++ b/trunk/drivers/net/pcmcia/Makefile
@@ -4,5 +4,3 @@
 
 # 16-bit client drivers
 obj-$(CONFIG_ARCNET_COM20020_CS)+= com20020_cs.o
-
-obj-$(CONFIG_PCMCIA_IBMTR)	+= ibmtr_cs.o
diff --git a/trunk/drivers/net/tokenring/Kconfig b/trunk/drivers/net/tokenring/Kconfig
index c4137b0f808e..0f701588c7eb 100644
--- a/trunk/drivers/net/tokenring/Kconfig
+++ b/trunk/drivers/net/tokenring/Kconfig
@@ -6,7 +6,7 @@
 menuconfig TR
 	tristate "Token Ring driver support"
 	depends on NETDEVICES && !UML
-	depends on (PCI || ISA || MCA || CCW)
+	depends on (PCI || ISA || MCA || CCW || PCMCIA)
 	select LLC
 	help
 	  Token Ring is IBM's way of communication on a local network; the
@@ -20,6 +20,17 @@ menuconfig TR
 
 if TR
 
+config PCMCIA_IBMTR
+	tristate "IBM PCMCIA tokenring adapter support"
+	depends on IBMTR!=y && PCMCIA
+	---help---
+	  Say Y here if you intend to attach this type of Token Ring PCMCIA
+	  card to your computer. You then also need to say Y to "Token Ring
+	  driver support".
+
+	  To compile this driver as a module, choose M here: the module will be
+	  called ibmtr_cs.
+
 config IBMTR
 	tristate "IBM Tropic chipset based adapter support"
 	depends on ISA || MCA
diff --git a/trunk/drivers/net/tokenring/Makefile b/trunk/drivers/net/tokenring/Makefile
index c88b0a5e5380..f1be8d97b7a8 100644
--- a/trunk/drivers/net/tokenring/Makefile
+++ b/trunk/drivers/net/tokenring/Makefile
@@ -2,14 +2,15 @@
 # Makefile for drivers/net/tokenring
 #
 
-obj-$(CONFIG_IBMTR) 	+= ibmtr.o
-obj-$(CONFIG_IBMOL) 	+= olympic.o
-obj-$(CONFIG_IBMLS) 	+= lanstreamer.o
-obj-$(CONFIG_TMS380TR) 	+= tms380tr.o
-obj-$(CONFIG_ABYSS) 	+= abyss.o
-obj-$(CONFIG_MADGEMC) 	+= madgemc.o
-obj-$(CONFIG_PROTEON) 	+= proteon.o
-obj-$(CONFIG_TMSPCI) 	+= tmspci.o
-obj-$(CONFIG_SKISA) 	+= skisa.o
-obj-$(CONFIG_SMCTR) 	+= smctr.o
+obj-$(CONFIG_PCMCIA_IBMTR)	+= ibmtr_cs.o
+obj-$(CONFIG_IBMTR)	+= ibmtr.o
+obj-$(CONFIG_IBMOL)	+= olympic.o
+obj-$(CONFIG_IBMLS)	+= lanstreamer.o
+obj-$(CONFIG_TMS380TR)	+= tms380tr.o
+obj-$(CONFIG_ABYSS)	+= abyss.o
+obj-$(CONFIG_MADGEMC)	+= madgemc.o
+obj-$(CONFIG_PROTEON)	+= proteon.o
+obj-$(CONFIG_TMSPCI)	+= tmspci.o
+obj-$(CONFIG_SKISA)	+= skisa.o
+obj-$(CONFIG_SMCTR)	+= smctr.o
 obj-$(CONFIG_3C359)	+= 3c359.o
diff --git a/trunk/drivers/net/pcmcia/ibmtr_cs.c b/trunk/drivers/net/tokenring/ibmtr_cs.c
similarity index 99%
rename from trunk/drivers/net/pcmcia/ibmtr_cs.c
rename to trunk/drivers/net/tokenring/ibmtr_cs.c
index 6006d5488fbe..91b684630fc5 100644
--- a/trunk/drivers/net/pcmcia/ibmtr_cs.c
+++ b/trunk/drivers/net/tokenring/ibmtr_cs.c
@@ -66,7 +66,7 @@
 #include <asm/system.h>
 
 #define PCMCIA
-#include "../tokenring/ibmtr.c"
+#include "ibmtr.c"
 
 
 /*====================================================================*/