From 9df82afc2017d471a670bba6cfbe1660756c4084 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Sun, 15 Jan 2012 21:48:38 +0100 Subject: [PATCH] --- yaml --- r: 291677 b: refs/heads/master c: 60d3369edb03fb4799c45ac594e2b8a76aa9079c h: refs/heads/master i: 291675: 97f0c8a82002d72abbaaa20a2f0daabb804ef9f3 v: v3 --- [refs] | 2 +- trunk/include/trace/events/power.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 67c10e431f15..8cae50239015 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61c54d20d16f098823058b07b399ac5b716ea5ba +refs/heads/master: 60d3369edb03fb4799c45ac594e2b8a76aa9079c diff --git a/trunk/include/trace/events/power.h b/trunk/include/trace/events/power.h index 1bcc2a8c00e2..b2626999e580 100644 --- a/trunk/include/trace/events/power.h +++ b/trunk/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 /*