From 90d140ce586e55d526a5c4eab4ace33af0a0b304 Mon Sep 17 00:00:00 2001
From: Daniel Lezcano <daniel.lezcano@linaro.org>
Date: Wed, 31 Oct 2012 01:05:16 +0100
Subject: [PATCH] --- yaml --- r: 336730 b: refs/heads/master c:
 349631e0e411fefa2fed7e0a30b97704562dbd6b h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/cpuidle/sysfs.c | 7 +++++++
 trunk/include/linux/cpuidle.h | 7 -------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 3a600da1e9c2..f5fbfb865110 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c96ca4fb76b711279be063da083f09b8d65af5c5
+refs/heads/master: 349631e0e411fefa2fed7e0a30b97704562dbd6b
diff --git a/trunk/drivers/cpuidle/sysfs.c b/trunk/drivers/cpuidle/sysfs.c
index ed87399bb02b..f15c1e56e16f 100644
--- a/trunk/drivers/cpuidle/sysfs.c
+++ b/trunk/drivers/cpuidle/sysfs.c
@@ -297,6 +297,13 @@ static struct attribute *cpuidle_state_default_attrs[] = {
 	NULL
 };
 
+struct cpuidle_state_kobj {
+	struct cpuidle_state *state;
+	struct cpuidle_state_usage *state_usage;
+	struct completion kobj_unregister;
+	struct kobject kobj;
+};
+
 #define kobj_to_state_obj(k) container_of(k, struct cpuidle_state_kobj, kobj)
 #define kobj_to_state(k) (kobj_to_state_obj(k)->state)
 #define kobj_to_state_usage(k) (kobj_to_state_obj(k)->state_usage)
diff --git a/trunk/include/linux/cpuidle.h b/trunk/include/linux/cpuidle.h
index 279b1eaa8b73..7daf0e3b93bd 100644
--- a/trunk/include/linux/cpuidle.h
+++ b/trunk/include/linux/cpuidle.h
@@ -82,13 +82,6 @@ cpuidle_set_statedata(struct cpuidle_state_usage *st_usage, void *data)
 	st_usage->driver_data = data;
 }
 
-struct cpuidle_state_kobj {
-	struct cpuidle_state *state;
-	struct cpuidle_state_usage *state_usage;
-	struct completion kobj_unregister;
-	struct kobject kobj;
-};
-
 struct cpuidle_device {
 	unsigned int		registered:1;
 	unsigned int		enabled:1;