diff options
| author | Linus Torvalds | 2011-11-08 23:24:18 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2011-11-08 23:24:18 +0100 |
| commit | 3b7546211d53f600e15ca7867adbf3c085b8ecc9 (patch) | |
| tree | 9bd7f0eb414bad882d3e7f59e742ac1a21e804c5 /include/linux | |
| parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hw... (diff) | |
| parent | PM / OPP: Use ERR_CAST instead of ERR_PTR(PTR_ERR()) (diff) | |
| download | kernel-qcow2-linux-3b7546211d53f600e15ca7867adbf3c085b8ecc9.tar.gz kernel-qcow2-linux-3b7546211d53f600e15ca7867adbf3c085b8ecc9.tar.xz kernel-qcow2-linux-3b7546211d53f600e15ca7867adbf3c085b8ecc9.zip | |
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/linux')
| -rw-r--r-- | include/linux/devfreq.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h index afb94583960c..98ce8124b1cc 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; }; /** |