From a68256b74dbfce6e70d7d7394173abeede0eee09 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 6 Mar 2009 12:47:08 +0100
Subject: [PATCH] --- yaml --- r: 140875 b: refs/heads/master c:
 af438c0f114b6f731b923b5c07150f6159471502 h: refs/heads/master i:   140873:
 c2d3d0d89148ab34a313b9a31b6caa6369a06e6c   140871:
 a1c4aab2de6a2bcf3cfffe27e03efa9d8a3c6251 v: v3

---
 [refs]                      | 2 +-
 trunk/include/trace/power.h | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index af03747c93e6..4aa28c91b7cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10dd3ebe213c31bff14b4dae3c5d32a76b1fad7c
+refs/heads/master: af438c0f114b6f731b923b5c07150f6159471502
diff --git a/trunk/include/trace/power.h b/trunk/include/trace/power.h
index 2c733e58e89c..38aca537e497 100644
--- a/trunk/include/trace/power.h
+++ b/trunk/include/trace/power.h
@@ -11,12 +11,10 @@ enum {
 };
 
 struct power_trace {
-#ifdef CONFIG_POWER_TRACER
 	ktime_t			stamp;
 	ktime_t			end;
 	int			type;
 	int			state;
-#endif
 };
 
 DECLARE_TRACE(power_start,