Merge branch 'master' into tk71

[mv-sheeva.git] / include / linux / resume-trace.h

diff --git a/include/linux/resume-trace.h b/include/linux/resume-trace.h
index bc8c3881c729fb29128b373b8fb6e0ad68feac45..f31db23687828da2e209696c8612cb3f7a195801 100644 (file)
--- a/include/linux/resume-trace.h
+++ b/include/linux/resume-trace.h
@@ -3,6 +3,7 @@
 
 #ifdef CONFIG_PM_TRACE
 #include <asm/resume-trace.h>
+#include <linux/types.h>
 
 extern int pm_trace_enabled;
 
@@ -14,6 +15,7 @@ static inline int pm_trace_is_enabled(void)
 struct device;
 extern void set_trace_device(struct device *);
 extern void generate_resume_trace(const void *tracedata, unsigned int user);
+extern int show_trace_dev_match(char *buf, size_t size);
 
 #define TRACE_DEVICE(dev) do { \
        if (pm_trace_enabled) \