diff options
-rw-r--r-- | drivers/cpuidle/governors/menu.c | 2 | ||||
-rw-r--r-- | include/linux/cpuidle.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c index 5c17ca112fc2..06335756ea14 100644 --- a/drivers/cpuidle/governors/menu.c +++ b/drivers/cpuidle/governors/menu.c | |||
@@ -236,7 +236,7 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev) | |||
236 | { | 236 | { |
237 | struct menu_device *data = &__get_cpu_var(menu_devices); | 237 | struct menu_device *data = &__get_cpu_var(menu_devices); |
238 | int latency_req = pm_qos_request(PM_QOS_CPU_DMA_LATENCY); | 238 | int latency_req = pm_qos_request(PM_QOS_CPU_DMA_LATENCY); |
239 | unsigned int power_usage = -1; | 239 | int power_usage = -1; |
240 | int i; | 240 | int i; |
241 | int multiplier; | 241 | int multiplier; |
242 | struct timespec t; | 242 | struct timespec t; |
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index d557bcd0ada7..6c26a3da0e03 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h | |||
@@ -44,7 +44,7 @@ struct cpuidle_state { | |||
44 | 44 | ||
45 | unsigned int flags; | 45 | unsigned int flags; |
46 | unsigned int exit_latency; /* in US */ | 46 | unsigned int exit_latency; /* in US */ |
47 | unsigned int power_usage; /* in mW */ | 47 | int power_usage; /* in mW */ |
48 | unsigned int target_residency; /* in US */ | 48 | unsigned int target_residency; /* in US */ |
49 | unsigned int disable; | 49 | unsigned int disable; |
50 | 50 | ||