aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/Kconfig
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2006-01-26 22:33:43 -0500
committerJeff Garzik <jgarzik@pobox.com>2006-01-26 22:33:43 -0500
commit71e834f563799e09c6bd7d6638993b464fac26f5 (patch)
tree3a35643ddc54e7217ec000eb415cc79a65cdcac1 /drivers/net/Kconfig
parentff0fc1467f8189c8e2340b91161c97138a75e484 (diff)
parent3ee68c4af3fd7228c1be63254b9f884614f9ebb2 (diff)
Merge branch 'master'
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r--drivers/net/Kconfig10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 1421941487c..626508afe1b 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -7,6 +7,7 @@ menu "Network device support"
config NETDEVICES
depends on NET
+ default y if UML
bool "Network device support"
---help---
You can say N here if you don't intend to connect your Linux box to
@@ -1914,6 +1915,15 @@ config E1000_NAPI
If in doubt, say N.
+config E1000_DISABLE_PACKET_SPLIT
+ bool "Disable Packet Split for PCI express adapters"
+ depends on E1000
+ help
+ Say Y here if you want to use the legacy receive path for PCI express
+ hadware.
+
+ If in doubt, say N.
+
source "drivers/net/ixp2000/Kconfig"
config MYRI_SBUS