From 60d3369edb03fb4799c45ac594e2b8a76aa9079c Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Sun, 15 Jan 2012 21:48:38 +0100
Subject: Fix up version number reference in include/trace/events/power.h
What was originally going to be 2.6.41 became 3.1 .
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---
include/trace/events/power.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'include/trace/events')
diff --git a/include/trace/events/power.h b/include/trace/events/power.h
index 1bcc2a8c00e2..b2626999e580 100644
--- a/include/trace/events/power.h
+++ b/include/trace/events/power.h
@@ -65,7 +65,7 @@ TRACE_EVENT(machine_suspend,
TP_printk("state=%lu", (unsigned long)__entry->state)
);
-/* This code will be removed after deprecation time exceeded (2.6.41) */
+/* This code will be removed after deprecation time exceeded (3.1) */
#ifdef CONFIG_EVENT_POWER_TRACING_DEPRECATED
/*
--
cgit v1.2.2
From 42481ba29033b3e692fe81e6536fc8f59b40ce07 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Sat, 4 Feb 2012 23:29:19 +0100
Subject: Remove incorrect comment from include/trace/events/power.h
The code is not going to be removed, so remove the comment stating
that it will be.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---
include/trace/events/power.h | 1 -
1 file changed, 1 deletion(-)
(limited to 'include/trace/events')
diff --git a/include/trace/events/power.h b/include/trace/events/power.h
index b2626999e580..5800eb848827 100644
--- a/include/trace/events/power.h
+++ b/include/trace/events/power.h
@@ -65,7 +65,6 @@ TRACE_EVENT(machine_suspend,
TP_printk("state=%lu", (unsigned long)__entry->state)
);
-/* This code will be removed after deprecation time exceeded (3.1) */
#ifdef CONFIG_EVENT_POWER_TRACING_DEPRECATED
/*
--
cgit v1.2.2