summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorRafael J. Wysocki2013-11-07 19:25:12 +0100
committerRafael J. Wysocki2013-11-07 19:25:12 +0100
commitadf9684588ec1769b77a9e1c7c68fbad49ec5e43 (patch)
tree092084faf9de9dd146363f9dac6d88ebdbfb86f1 /Documentation
parentMerge branch 'pm-devfreq' (diff)
parentARM: EXYNOS: Remove incorrect __init annotation from cpuidle driver (diff)
downloadkernel-qcow2-linux-adf9684588ec1769b77a9e1c7c68fbad49ec5e43.tar.gz
kernel-qcow2-linux-adf9684588ec1769b77a9e1c7c68fbad49ec5e43.tar.xz
kernel-qcow2-linux-adf9684588ec1769b77a9e1c7c68fbad49ec5e43.zip
Merge branch 'pm-cpuidle'
* pm-cpuidle: ARM: EXYNOS: Remove incorrect __init annotation from cpuidle driver ARM: EXYNOS: Use dev_err() instead of printk() for cpuidle driver intel_idle: use CPU_TASKS_FROZEN instead of a numeric constant cpuidle: remove cpuidle_unregister_governor() cpuidle: don't call poll_idle_init() for every cpu cpuidle: use drv instead of cpuidle_driver in show_current_driver() cpuidle: call cpuidle_get_driver() from after taking cpuidle_driver_lock cpuidle: replace multiline statements with single line in cpuidle_idle_call() cpuidle: reduce code duplication inside cpuidle_idle_call() cpuidle: merge two if() statements for checking error cases cpuidle: rearrange __cpuidle_register_device() to keep minimal exit points cpuidle: rearrange code in __cpuidle_driver_init() cpuidle: make __cpuidle_driver_init() return void cpuidle: make __cpuidle_device_init() return void cpuidle: Fix comments in cpuidle core cpuidle: fix indentation of cpumask
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/cpuidle/governor.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/cpuidle/governor.txt b/Documentation/cpuidle/governor.txt
index 12c6bd50c9f6..d9020f5e847b 100644
--- a/Documentation/cpuidle/governor.txt
+++ b/Documentation/cpuidle/governor.txt
@@ -25,5 +25,4 @@ kernel configuration and platform will be selected by cpuidle.
Interfaces:
extern int cpuidle_register_governor(struct cpuidle_governor *gov);
-extern void cpuidle_unregister_governor(struct cpuidle_governor *gov);
struct cpuidle_governor