From 385fcd85597142f61d5b563b9d0e4f3a30012397 Mon Sep 17 00:00:00 2001
From: Daniel Lezcano <daniel.lezcano@linaro.org>
Date: Mon, 26 Mar 2012 14:51:28 +0200
Subject: [PATCH] --- yaml --- r: 298021 b: refs/heads/master c:
 e07510585a88c0f6c6c728e2e006aa913496d4ae h: refs/heads/master i:   298019:
 11a68d5bf30fca026527e7b797eaae4d0c792a2d v: v3

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

diff --git a/[refs] b/[refs]
index 7ac3c55e30ef..847b9ade6f31 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db70b04407a63668e5fee773f76f90367492fd25
+refs/heads/master: e07510585a88c0f6c6c728e2e006aa913496d4ae
diff --git a/trunk/include/linux/cpuidle.h b/trunk/include/linux/cpuidle.h
index f7f1d9040da3..f3ebbba368b3 100644
--- a/trunk/include/linux/cpuidle.h
+++ b/trunk/include/linux/cpuidle.h
@@ -98,7 +98,6 @@ struct cpuidle_device {
 	struct list_head 	device_list;
 	struct kobject		kobj;
 	struct completion	kobj_unregister;
-	void			*governor_data;
 };
 
 DECLARE_PER_CPU(struct cpuidle_device *, cpuidle_devices);