diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-13 15:55:20 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-13 15:55:20 -0400 |
| commit | 421355de876b9f3fcc7e4cb6026e416fb12a5068 (patch) | |
| tree | fb814456af86c75e1eb9e330994dda461fc5b4f7 /drivers/net/Kconfig | |
| parent | aace495933a981274b6491d71b915165a61defdc (diff) | |
| parent | 0fe7463a35aadfaf22d1ca58325ab3851b8d757c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index d9772af812c4..04fb8b0ca3e6 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -3230,4 +3230,12 @@ config VIRTIO_NET | |||
| 3230 | This is the virtual network driver for virtio. It can be used with | 3230 | This is the virtual network driver for virtio. It can be used with |
| 3231 | lguest or QEMU based VMMs (like KVM or Xen). Say Y or M. | 3231 | lguest or QEMU based VMMs (like KVM or Xen). Say Y or M. |
| 3232 | 3232 | ||
| 3233 | config VMXNET3 | ||
| 3234 | tristate "VMware VMXNET3 ethernet driver" | ||
| 3235 | depends on PCI && X86 | ||
| 3236 | help | ||
| 3237 | This driver supports VMware's vmxnet3 virtual ethernet NIC. | ||
| 3238 | To compile this driver as a module, choose M here: the | ||
| 3239 | module will be called vmxnet3. | ||
| 3240 | |||
| 3233 | endif # NETDEVICES | 3241 | endif # NETDEVICES |