From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>,
netdev@vger.kernel.org, gospo@redhat.com,
Mike Phillips <phillim@amtrak.com>,
Burt Silverman <burts@us.ibm.com>
Subject: [net-next 07/10] ixbmtr_cs: Move the IBM PCMCIA Token Ring driver
Date: Sat, 27 Aug 2011 02:55:13 -0700 [thread overview]
Message-ID: <1314438916-2478-8-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1314438916-2478-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the IBM PCMCIA Token Ring driver into drivers/net/tokenring/ with
the other Token Ring drivers. Made the necessary Kconfig and Makefile
changes as well.
CC: Mike Phillips <phillim@amtrak.com>
CC: Burt Silverman <burts@us.ibm.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/pcmcia/Kconfig | 11 -----------
drivers/net/pcmcia/Makefile | 2 --
drivers/net/tokenring/Kconfig | 13 ++++++++++++-
drivers/net/tokenring/Makefile | 21 +++++++++++----------
drivers/net/{pcmcia => tokenring}/ibmtr_cs.c | 2 +-
5 files changed, 24 insertions(+), 25 deletions(-)
rename drivers/net/{pcmcia => tokenring}/ibmtr_cs.c (99%)
diff --git a/drivers/net/pcmcia/Kconfig b/drivers/net/pcmcia/Kconfig
index 12e7ae4..ff4deb0 100644
--- a/drivers/net/pcmcia/Kconfig
+++ b/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/drivers/net/pcmcia/Makefile b/drivers/net/pcmcia/Makefile
index 618e816..b98a0a4 100644
--- a/drivers/net/pcmcia/Makefile
+++ b/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/drivers/net/tokenring/Kconfig b/drivers/net/tokenring/Kconfig
index c4137b0..0f70158 100644
--- a/drivers/net/tokenring/Kconfig
+++ b/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/drivers/net/tokenring/Makefile b/drivers/net/tokenring/Makefile
index c88b0a5..f1be8d9 100644
--- a/drivers/net/tokenring/Makefile
+++ b/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/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/tokenring/ibmtr_cs.c
similarity index 99%
rename from drivers/net/pcmcia/ibmtr_cs.c
rename to drivers/net/tokenring/ibmtr_cs.c
index 6006d54..91b6846 100644
--- a/drivers/net/pcmcia/ibmtr_cs.c
+++ b/drivers/net/tokenring/ibmtr_cs.c
@@ -66,7 +66,7 @@
#include <asm/system.h>
#define PCMCIA
-#include "../tokenring/ibmtr.c"
+#include "ibmtr.c"
/*====================================================================*/
--
1.7.6
next prev parent reply other threads:[~2011-08-27 9:55 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-27 9:55 [net-next 00/10 v4][pull request] Complete drivers/net/ move Jeff Kirsher
2011-08-27 9:55 ` [net-next 01/10] fddi: Move the FDDI drivers Jeff Kirsher
2011-08-27 9:55 ` [net-next 02/10] skfp: Fix SysKonnect FDDI driver compile issues Jeff Kirsher
2011-08-27 9:55 ` [net-next 03/10] ppp: Move the PPP drivers Jeff Kirsher
2011-08-27 9:55 ` [net-next 04/10] hippi: Move the HIPPI driver Jeff Kirsher
2011-08-27 9:55 ` [net-next 05/10] plip: Move the PLIP driver Jeff Kirsher
2011-08-27 9:55 ` [net-next 06/10] slip: Move the SLIP drivers Jeff Kirsher
2011-08-27 9:55 ` Jeff Kirsher [this message]
2011-08-27 9:55 ` [net-next 08/10] com20020_cs: Move the PCMCIA Arcnet driver Jeff Kirsher
2011-08-27 9:55 ` [net-next 09/10] drivers/net: Kconfig & Makefile cleanup Jeff Kirsher
2011-08-27 9:55 ` [net-next 10/10] drivers/net/ethernet/*: Enabled vendor Kconfig options Jeff Kirsher
2011-08-27 16:26 ` [net-next 00/10 v4][pull request] Complete drivers/net/ move David Miller
-- strict thread matches above, loose matches on Subject: below --
2011-08-25 4:50 [net-next 00/10][pull " Jeff Kirsher
2011-08-25 4:50 ` [net-next 07/10] ixbmtr_cs: Move the IBM PCMCIA Token Ring driver Jeff Kirsher
2011-08-24 9:02 [net-next 00/10][pull request] Complete drivers/net/ move Jeff Kirsher
2011-08-24 9:02 ` [net-next 07/10] ixbmtr_cs: Move the IBM PCMCIA Token Ring driver Jeff Kirsher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1314438916-2478-8-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=burts@us.ibm.com \
--cc=davem@davemloft.net \
--cc=gospo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=phillim@amtrak.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).