diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-14 22:18:04 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-14 22:18:04 +0200 |
| commit | ee42f75dba3c66e559a13ac86ad1889d2a396378 (patch) | |
| tree | c2e234d229ff467999cfb366f1edef80ea243433 /include | |
| parent | Linux 3.11-rc5 (diff) | |
| parent | Merge branch 'cpuidle-arm' into pm-cpuidle (diff) | |
| download | linux-ee42f75dba3c66e559a13ac86ad1889d2a396378.tar.xz linux-ee42f75dba3c66e559a13ac86ad1889d2a396378.zip | |
Merge back earlier 'pm-cpuidle' material.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cpuidle.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 0bc4b74668e9..781addc66f03 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -13,8 +13,6 @@ #include <linux/percpu.h> #include <linux/list.h> -#include <linux/kobject.h> -#include <linux/completion.h> #include <linux/hrtimer.h> #define CPUIDLE_STATE_MAX 10 @@ -61,6 +59,10 @@ struct cpuidle_state { #define CPUIDLE_DRIVER_FLAGS_MASK (0xFFFF0000) +struct cpuidle_device_kobj; +struct cpuidle_state_kobj; +struct cpuidle_driver_kobj; + struct cpuidle_device { unsigned int registered:1; unsigned int enabled:1; @@ -71,9 +73,8 @@ struct cpuidle_device { struct cpuidle_state_usage states_usage[CPUIDLE_STATE_MAX]; struct cpuidle_state_kobj *kobjs[CPUIDLE_STATE_MAX]; struct cpuidle_driver_kobj *kobj_driver; + struct cpuidle_device_kobj *kobj_dev; struct list_head device_list; - struct kobject kobj; - struct completion kobj_unregister; #ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED int safe_state_index; |