diff options
| author |   Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-22 17:37:03 -0700 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-27 00:58:39 -0700 |
| commit | c0153225a0e86013b8b8267ffd94e5484d83b916 (patch) | |
| tree | 4fc92fd61995d2f19d9cfa605732be435aaa2b85 /drivers/net/tokenring/Kconfig | |
| parent | slip: Move the SLIP drivers (diff) | |
| download | linux-dev-c0153225a0e86013b8b8267ffd94e5484d83b916.tar.xz linux-dev-c0153225a0e86013b8b8267ffd94e5484d83b916.zip | |
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: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/tokenring/Kconfig')
| -rw-r--r-- | drivers/net/tokenring/Kconfig | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/net/tokenring/Kconfig b/drivers/net/tokenring/Kconfig index c4137b0f808e..0f701588c7eb 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 |