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/arcnet/Kconfig | |
| parent | efe3d3c8ee6805c7e8b17f9aae554c04b271ab99 (diff) | |
| parent | 88f07484ccdf08e58dc462ed1ac7eb2e84d88a17 (diff) | |
| download | linux-95148229d32e5c68445a59d981482dba57f91919.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/next-organize
Diffstat (limited to 'drivers/net/arcnet/Kconfig')
| -rw-r--r-- | drivers/net/arcnet/Kconfig | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/net/arcnet/Kconfig b/drivers/net/arcnet/Kconfig index 3b2f7f115464..a73d9dc80ff6 100644 --- a/drivers/net/arcnet/Kconfig +++ b/drivers/net/arcnet/Kconfig @@ -3,8 +3,8 @@ # menuconfig ARCNET - depends on NETDEVICES && (ISA || PCI) - tristate "ARCnet support" + depends on NETDEVICES && (ISA || PCI || PCMCIA) + bool "ARCnet support" ---help--- If you have a network card of this type, say Y and check out the (arguably) beautiful poetry in @@ -123,4 +123,14 @@ config ARCNET_COM20020_PCI tristate "Support for COM20020 on PCI" depends on ARCNET_COM20020 && PCI +config ARCNET_COM20020_CS + tristate "COM20020 ARCnet PCMCIA support" + depends on ARCNET_COM20020 && PCMCIA + help + Say Y here if you intend to attach this type of ARCnet PCMCIA card + to your computer. + + To compile this driver as a module, choose M here: the module will be + called com20020_cs. If unsure, say N. + endif # ARCNET |