diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-12-17 17:00:49 -0500 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-12-17 17:00:49 -0500 |
| commit | a4581b35e1bc80becf240238bc787a5ec2727db0 (patch) | |
| tree | 34cbf36101639403a766e74deb36e7015d871b39 /drivers/net/arcnet/Kconfig | |
| parent | f940b88d3a57594289455ea99a93a8ddc5c4af06 (diff) | |
| parent | 384703b8e6cd4c8ef08512e596024e028c91c339 (diff) | |
Merge commit 'v3.2-rc6' into fbdev-next
Diffstat (limited to 'drivers/net/arcnet/Kconfig')
| -rw-r--r-- | drivers/net/arcnet/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/arcnet/Kconfig b/drivers/net/arcnet/Kconfig index a73d9dc80ff6..84fb6349a59a 100644 --- a/drivers/net/arcnet/Kconfig +++ b/drivers/net/arcnet/Kconfig | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | menuconfig ARCNET | 5 | menuconfig ARCNET |
| 6 | depends on NETDEVICES && (ISA || PCI || PCMCIA) | 6 | depends on NETDEVICES && (ISA || PCI || PCMCIA) |
| 7 | bool "ARCnet support" | 7 | tristate "ARCnet support" |
| 8 | ---help--- | 8 | ---help--- |
| 9 | If you have a network card of this type, say Y and check out the | 9 | If you have a network card of this type, say Y and check out the |
| 10 | (arguably) beautiful poetry in | 10 | (arguably) beautiful poetry in |