aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/packetengines
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-03-05 21:16:26 -0500
committerDavid S. Miller <davem@davemloft.net>2012-03-05 21:16:26 -0500
commitf6a1ad4295f9291038380178d09978caf6982dd8 (patch)
tree7c35e8efe1812baca9c6b9674be1ee02a0495ec3 /drivers/net/ethernet/packetengines
parentr8169: add byte queue limit support. (diff)
parentMerge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff)
downloadlinux-dev-f6a1ad4295f9291038380178d09978caf6982dd8.tar.xz
linux-dev-f6a1ad4295f9291038380178d09978caf6982dd8.zip
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/Kconfig1
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 @@
config NET_PACKET_ENGINE
bool "Packet Engine devices"
+ default y
depends on PCI
---help---
If you have a network (Ethernet) card belonging to this class, say Y