Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...

[deliverable/linux.git] / samples / Kconfig

diff --git a/samples/Kconfig b/samples/Kconfig
index ccc50beaf17b8d664831849fced771c9996ecd76..85c405fcccb0cb08ec59efa262961e08bb3389f1 100644 (file)
--- a/samples/Kconfig
+++ b/samples/Kconfig
@@ -11,6 +11,13 @@ config SAMPLE_TRACE_EVENTS
        help
          This build trace event example modules.
 
+config SAMPLE_TRACE_PRINTK
+        tristate "Build trace_printk module - tests various trace_printk formats"
+       depends on EVENT_TRACING && m
+       help
+        This builds a module that calls trace_printk() and can be used to
+        test various trace_printk() calls from a module.
+
 config SAMPLE_KOBJECT
        tristate "Build kobject examples -- loadable modules only"
        depends on m