Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[GitHub/moto-9609/android_kernel_motorola_exynos9610.git] / include / linux / devfreq.h

diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
index c8c995325ca83125002fa750e19385a255fc65ce..d48dc00232a436cbf67b577b54a8bd27336a161c 100644 (file)
--- a/include/linux/devfreq.h
+++ b/include/linux/devfreq.h
@@ -15,7 +15,7 @@
 
 #include <linux/device.h>
 #include <linux/notifier.h>
-#include <linux/opp.h>
+#include <linux/pm_opp.h>
 
 #define DEVFREQ_NAME_LEN 16
 
@@ -168,7 +168,7 @@ struct devfreq {
        unsigned long max_freq;
        bool stop_polling;
 
-       /* information for device freqeuncy transition */
+       /* information for device frequency transition */
        unsigned int total_trans;
        unsigned int *trans_table;
        unsigned long *time_in_state;