Commit c0153225 authored by Jeff Kirsher's avatar Jeff Kirsher

ixbmtr_cs: Move the IBM PCMCIA Token Ring driver

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: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent b5451d78
......@@ -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
......@@ -4,5 +4,3 @@
# 16-bit client drivers
obj-$(CONFIG_ARCNET_COM20020_CS)+= com20020_cs.o
obj-$(CONFIG_PCMCIA_IBMTR) += ibmtr_cs.o
......@@ -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
......
......@@ -2,6 +2,7 @@
# Makefile for drivers/net/tokenring
#
obj-$(CONFIG_PCMCIA_IBMTR) += ibmtr_cs.o
obj-$(CONFIG_IBMTR) += ibmtr.o
obj-$(CONFIG_IBMOL) += olympic.o
obj-$(CONFIG_IBMLS) += lanstreamer.o
......
......@@ -66,7 +66,7 @@
#include <asm/system.h>
#define PCMCIA
#include "../tokenring/ibmtr.c"
#include "ibmtr.c"
/*====================================================================*/
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment