diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-14 22:22:56 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-14 22:22:56 (GMT) |
| commit | 250dfa05e5be98d7c8f246181da51165f83bbe62 (patch) | |
| tree | 9c70494ba6443fd9c313eb5a1dcd0b600597dc40 /include | |
| parent | afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc (diff) | |
| parent | 7dbded06efe41367163e903331ef45bd765a62a4 (diff) | |
| download | linux-250dfa05e5be98d7c8f246181da51165f83bbe62.tar.xz | |
Merge branch 'for-rafael' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq into pm-devfreq
Pull devfreq changes for v4.5 from MyungJoo Ham.
* 'for-rafael' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq:
MAINTAINERS: Add devfreq-event entry
MAINTAINERS: Add missing git repository and directory for devfreq
PM / devfreq: Do not show statistics if it's not ready.
PM / devfreq: Modify the indentation of trans_stat sysfs for readability
PM / devfreq: Set the freq_table of devfreq device
PM / devfreq: Add show_one macro to delete the duplicate code
PM / devfreq: event: Fix the error and warning from script/checkpatch.pl
PM / devfreq: event: Remove the error log of devfreq_event_get_edev_by_phandle()
Diffstat (limited to 'include')
| -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 68030e2..6fa02a2 100644 --- a/include/linux/devfreq.h +++ b/include/linux/devfreq.h @@ -89,7 +89,7 @@ struct devfreq_dev_profile { int (*get_cur_freq)(struct device *dev, unsigned long *freq); void (*exit)(struct device *dev); - unsigned int *freq_table; + unsigned long *freq_table; unsigned int max_state; }; |