Merge commit 'gcl/next' into next

[sfrench/cifs-2.6.git] / samples / Kconfig

diff --git a/samples/Kconfig b/samples/Kconfig
index e1fb471cc50182e5e907bef3caa566f8ede7e6d4..4b02f5a0e6560f4c886d413409d5507ffe6b0356 100644 (file)
--- a/samples/Kconfig
+++ b/samples/Kconfig
@@ -13,6 +13,12 @@ config SAMPLE_MARKERS
        help
          This build markers example modules.
 
+config SAMPLE_TRACEPOINTS
+       tristate "Build tracepoints examples -- loadable modules only"
+       depends on TRACEPOINTS && m
+       help
+         This build tracepoints example modules.
+
 config SAMPLE_KOBJECT
        tristate "Build kobject examples"
        help