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,