From af444fb4442609e7971e1e40cadadfd55d978d3a Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Sat, 4 Feb 2012 23:29:19 +0100 Subject: [PATCH] --- yaml --- r: 291696 b: refs/heads/master c: 42481ba29033b3e692fe81e6536fc8f59b40ce07 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/trace/events/power.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c921ad91e8f6..1393c8378231 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 241057486646dd42278538218376c79aae2c359f +refs/heads/master: 42481ba29033b3e692fe81e6536fc8f59b40ce07 diff --git a/trunk/include/trace/events/power.h b/trunk/include/trace/events/power.h index b2626999e580..5800eb848827 100644 --- a/trunk/include/trace/events/power.h +++ b/trunk/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 /*