Merge branch 'for-rmk' of git://git.android.com/kernel into devel

1 files changed, 6 insertions, 0 deletions

diff --git a/samples/Kconfig b/samples/Kconfig
index e1fb471cc501..4b02f5a0e656 100644
--- 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