be2net: Implement ethtool get_phys_id function.

[net-next-2.6.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 706728be312f5506a8d3fd20b51d33bf9186144e..c7bac39d6c61b7da35e5ee1e9a8c9e33a2033807 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -331,7 +331,8 @@ config TREE_PREEMPT_RCU
          This option selects the RCU implementation that is
          designed for very large SMP systems with hundreds or
          thousands of CPUs, but for which real-time response
-         is also required.
+         is also required.  It also scales down nicely to
+         smaller systems.
 
 endchoice
 
@@ -1005,14 +1006,6 @@ config SLUB_DEBUG
          SLUB sysfs support. /sys/slab will not exist and there will be
          no support for cache validation etc.
 
-config STRIP_ASM_SYMS
-       bool "Strip assembler-generated symbols during link"
-       default n
-       help
-         Strip internal assembler-generated symbols during a link (symbols
-         that look like '.Lxxx') so they don't pollute the output of
-         get_wchan() and suchlike.
-
 config COMPAT_BRK
        bool "Disable heap randomization"
        default y
@@ -1071,13 +1064,6 @@ config PROFILING
 config TRACEPOINTS
        bool
 
-config MARKERS
-       bool "Activate markers"
-       select TRACEPOINTS
-       help
-         Place an empty function call at each marker site. Can be
-         dynamically changed for a probe function.
-
 source "arch/Kconfig"
 
 config SLOW_WORK