Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 171999e67eecbafaf3da223df8736a4077b95c71..626508afe1b176ce9dd1d2b0fcdab52f766dc1bc 100644 (file)
--- 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
@@ -2676,10 +2686,6 @@ config SHAPER
          Class-Based Queueing (CBQ) scheduling support which you get if you
          say Y to "QoS and/or fair queueing" above.
 
-         To set up and configure shaper devices, you need the shapecfg
-         program, available from <ftp://shadow.cabi.net/pub/Linux/> in the
-         shaper package.
-
          To compile this driver as a module, choose M here: the module
          will be called shaper.  If unsure, say N.