summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-01-20 23:43:13 (GMT)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-01-20 23:43:13 (GMT)
commitfa8bb4518771b19460a318fbab3eb36c81db3a50 (patch)
tree2f77b8379f54746aa76ab4630965a1dcdc9c8273 /include
parent6efd3f8cde1d6acc20a715ac6ea17e01421742df (diff)
parent250dfa05e5be98d7c8f246181da51165f83bbe62 (diff)
downloadlinux-fa8bb4518771b19460a318fbab3eb36c81db3a50.tar.xz
Merge branch 'pm-devfreq'
* pm-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.h2
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;
};