Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

[linux-2.6-omap-h63xx.git] / include / linux / ftrace.h

diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index 5812dba4ee249d2ef0a3bc19b2ab0b6fccdbf4ad..a3d46151be195cec1d701b7058ec98662860e65b 100644 (file)
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -215,9 +215,9 @@ ftrace_init_module(unsigned long *start, unsigned long *end) { }
 
 struct boot_trace {
        pid_t                   caller;
-       char                    func[KSYM_NAME_LEN];
+       char                    func[KSYM_NAME_LEN];
        int                     result;
-       unsigned long long      duration;
+       unsigned long long      duration;               /* usecs */
        ktime_t                 calltime;
        ktime_t                 rettime;
 };