nfs: new subdir Documentation/filesystems/nfs

[safe/jmp/linux-2.6] / samples / Kconfig

diff --git a/samples/Kconfig b/samples/Kconfig
index 93f41c0..b92bde3 100644 (file)
--- a/samples/Kconfig
+++ b/samples/Kconfig
@@ -7,12 +7,6 @@ menuconfig SAMPLES
 
 if SAMPLES
 
-config SAMPLE_MARKERS
-       tristate "Build markers examples -- loadable modules only"
-       depends on MARKERS && m
-       help
-         This build markers example modules.
-
 config SAMPLE_TRACEPOINTS
        tristate "Build tracepoints examples -- loadable modules only"
        depends on TRACEPOINTS && m
@@ -20,14 +14,14 @@ config SAMPLE_TRACEPOINTS
          This build tracepoints example modules.
 
 config SAMPLE_TRACE_EVENTS
-       tristate "Build trace_events examples"
-       depends on EVENT_TRACING
-       default m
+       tristate "Build trace_events examples -- loadable modules only"
+       depends on EVENT_TRACING && m
        help
          This build trace event example modules.
 
 config SAMPLE_KOBJECT
-       tristate "Build kobject examples"
+       tristate "Build kobject examples -- loadable modules only"
+       depends on m
        help
          This config option will allow you to build a number of
          different kobject sample modules showing how to use kobjects,