Merge branch 'omap-clock-fixes' of git://git.pwsan.com/linux-2.6

[linux-2.6-omap-h63xx.git] / Documentation / ftrace.txt

diff --git a/Documentation/ftrace.txt b/Documentation/ftrace.txt
index 2041ee951c1aa23ae770b39eefd1123076318abb..fd9a3e69381351aeeaa6712d07c5170aa7dca1a4 100644 (file)
--- a/Documentation/ftrace.txt
+++ b/Documentation/ftrace.txt
@@ -100,7 +100,7 @@ of ftrace. Here is a list of some of the key files:
        that is displayed in one of the above output
        files.
 
-  trace_max_latency:
+  tracing_max_latency:
 
        Some of the tracers record the max latency.
        For example, the time interrupts are disabled.
@@ -1466,11 +1466,11 @@ want, depending on your needs.
 
 
 You can put some comments on specific functions by using
-ftrace_printk() For example, if you want to put a comment inside
+trace_printk() For example, if you want to put a comment inside
 the __might_sleep() function, you just have to include
-<linux/ftrace.h> and call ftrace_printk() inside __might_sleep()
+<linux/ftrace.h> and call trace_printk() inside __might_sleep()
 
-ftrace_printk("I'm a comment!\n")
+trace_printk("I'm a comment!\n")
 
 will produce: