diff options
| author | David S. Miller <davem@davemloft.net> | 2012-03-05 21:16:26 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-05 21:16:26 -0500 |
| commit | f6a1ad4295f9291038380178d09978caf6982dd8 (patch) | |
| tree | 7c35e8efe1812baca9c6b9674be1ee02a0495ec3 /drivers/net/ethernet/packetengines | |
| parent | 036dafa28da1e2565a8529de2ae663c37b7a0060 (diff) | |
| parent | f3969bf78f140f437f51787dfc2751943ba454d1 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/vmxnet3/vmxnet3_drv.c
Small vmxnet3 conflict with header size bug fix in 'net'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/packetengines')
| -rw-r--r-- | drivers/net/ethernet/packetengines/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/packetengines/Kconfig b/drivers/net/ethernet/packetengines/Kconfig index b97132d9dff0..8f29feb35548 100644 --- a/drivers/net/ethernet/packetengines/Kconfig +++ b/drivers/net/ethernet/packetengines/Kconfig | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | config NET_PACKET_ENGINE | 5 | config NET_PACKET_ENGINE |
| 6 | bool "Packet Engine devices" | 6 | bool "Packet Engine devices" |
| 7 | default y | ||
| 7 | depends on PCI | 8 | depends on PCI |
| 8 | ---help--- | 9 | ---help--- |
| 9 | If you have a network (Ethernet) card belonging to this class, say Y | 10 | If you have a network (Ethernet) card belonging to this class, say Y |