diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-16 11:09:11 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-16 11:09:11 +1100 |
| commit | e6f08d37e6641b38b2da4ad40d6ca2cfb616a1dc (patch) | |
| tree | f6fbe6e761e72c972d6dc271cec087e870f6e033 /include/linux | |
| parent | 7c637b04fba553897f0de77d185e5263b06df06f (diff) | |
| parent | e8bb3e00cff93ef2a0cfc09c3294aa37b4737e09 (diff) | |
Merge branch 'cpuidle' into next
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/cpuidle.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 7408af843b8a..23f81de51829 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -130,7 +130,6 @@ struct cpuidle_driver { #ifdef CONFIG_CPU_IDLE extern void disable_cpuidle(void); extern int cpuidle_idle_call(void); - extern int cpuidle_register_driver(struct cpuidle_driver *drv); struct cpuidle_driver *cpuidle_get_driver(void); extern void cpuidle_unregister_driver(struct cpuidle_driver *drv); @@ -145,7 +144,6 @@ extern void cpuidle_disable_device(struct cpuidle_device *dev); #else static inline void disable_cpuidle(void) { } static inline int cpuidle_idle_call(void) { return -ENODEV; } - static inline int cpuidle_register_driver(struct cpuidle_driver *drv) {return -ENODEV; } static inline struct cpuidle_driver *cpuidle_get_driver(void) {return NULL; } |