summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-08 14:24:18 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-08 14:24:18 -0800
commit3b7546211d53f600e15ca7867adbf3c085b8ecc9 (patch)
tree9bd7f0eb414bad882d3e7f59e742ac1a21e804c5 /include
parentc8f17084fe0fa7fdb5ff21eab9ccce49439ebdb1 (diff)
parent156acb166ea9a43d7fcdf9b8051694ce4e91dbfc (diff)
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: PM / OPP: Use ERR_CAST instead of ERR_PTR(PTR_ERR()) PM / devfreq: fix private_data Documentation: Fix typo in freezer-subsystem.txt PM / QoS: Set cpu_dma_pm_qos->name
Diffstat (limited to 'include')
-rw-r--r--include/linux/devfreq.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
index afb94583960..98ce8124b1c 100644
--- a/include/linux/devfreq.h
+++ b/include/linux/devfreq.h
@@ -41,7 +41,7 @@ struct devfreq_dev_status {
unsigned long total_time;
unsigned long busy_time;
unsigned long current_frequency;
- void *private_date;
+ void *private_data;
};
/**