---

yaml --- r: 298023 b: refs/heads/master c: 02401c0 h: refs/heads/master i: 298021: 385fcd8 298019: 11a68d5 298015: 97bf5f8 v: v3
git-mirror · Mar 30, 2012 · 35d0993 · 35d0993
1 parent e04a7e9
commit 35d0993
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a022e3f1be11730bd8747b1af96a0274bf6356e
+refs/heads/master: 02401c06b7f6bec65f314e3cec7894502c973501
diff --git a/trunk/drivers/cpuidle/governors/menu.c b/trunk/drivers/cpuidle/governors/menu.c
@@ -236,7 +236,7 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev)
 {
 	struct menu_device *data = &__get_cpu_var(menu_devices);
 	int latency_req = pm_qos_request(PM_QOS_CPU_DMA_LATENCY);
-	unsigned int power_usage = -1;
+	int power_usage = -1;
 	int i;
 	int multiplier;
 	struct timespec t;

diff --git a/trunk/include/linux/cpuidle.h b/trunk/include/linux/cpuidle.h
@@ -44,7 +44,7 @@ struct cpuidle_state {
 
 	unsigned int	flags;
 	unsigned int	exit_latency; /* in US */
-	unsigned int	power_usage; /* in mW */
+	int		power_usage; /* in mW */
 	unsigned int	target_residency; /* in US */
 	unsigned int    disable;