diff options
| author | David S. Miller <davem@davemloft.net> | 2011-08-27 12:14:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-27 12:14:34 -0400 |
| commit | 95148229d32e5c68445a59d981482dba57f91919 (patch) | |
| tree | 5bbc1e38abd7db893036d2659788453edffc6dac /drivers/net/tokenring/Kconfig | |
| parent | efe3d3c8ee6805c7e8b17f9aae554c04b271ab99 (diff) | |
| parent | 88f07484ccdf08e58dc462ed1ac7eb2e84d88a17 (diff) | |
| download | linux-95148229d32e5c68445a59d981482dba57f91919.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/next-organize
Diffstat (limited to 'drivers/net/tokenring/Kconfig')
| -rw-r--r-- | drivers/net/tokenring/Kconfig | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/net/tokenring/Kconfig b/drivers/net/tokenring/Kconfig index c4137b0f808e..c7e0149d1514 100644 --- a/drivers/net/tokenring/Kconfig +++ b/drivers/net/tokenring/Kconfig @@ -4,9 +4,9 @@ # So far, we only have PCI, ISA, and MCA token ring devices menuconfig TR - tristate "Token Ring driver support" + bool "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 |