aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-15 19:43:29 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-15 19:43:29 -0500
commit3f02d072d46bb409e8ca3cf16c0511f5c21adaf6 (patch)
treebaec074db38a5ceaaabbcee76f199acef43bb42a /drivers/net/Kconfig
parent0238cb4e7583c521bb3538060f98a73e65f61324 (diff)
parentfb453d4b0b51ea71c9eb8192c61b768afeb7ee8a (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r--drivers/net/Kconfig4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 171999e67eec..1421941487c4 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2676,10 +2676,6 @@ config SHAPER
2676 Class-Based Queueing (CBQ) scheduling support which you get if you 2676 Class-Based Queueing (CBQ) scheduling support which you get if you
2677 say Y to "QoS and/or fair queueing" above. 2677 say Y to "QoS and/or fair queueing" above.
2678 2678
2679 To set up and configure shaper devices, you need the shapecfg
2680 program, available from <ftp://shadow.cabi.net/pub/Linux/> in the
2681 shaper package.
2682
2683 To compile this driver as a module, choose M here: the module 2679 To compile this driver as a module, choose M here: the module
2684 will be called shaper. If unsure, say N. 2680 will be called shaper. If unsure, say N.
2685 2681