From d78284839dbe45d778e933398a9af04f35de0a66 Mon Sep 17 00:00:00 2001
From: Kevin Cernekee <cernekee@gmail.com>
Date: Mon, 20 Sep 2010 22:32:10 +0200
Subject: [PATCH] --- yaml --- r: 212363 b: refs/heads/master c:
 0702d9ee0f1dcb6258789032f03b3208bfafaffc h: refs/heads/master i:   212361:
 1f58a2589592597873dce0617aedecdf48548eea   212359:
 a3d7414f39e7f7308b7ef66949281d394b71823c v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/base/power/main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d20f6c5fad29..e51d6a30fb59 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac5c24ec1e983313ef0015258fba6f630e54e7cf
+refs/heads/master: 0702d9ee0f1dcb6258789032f03b3208bfafaffc
diff --git a/trunk/drivers/base/power/main.c b/trunk/drivers/base/power/main.c
index 276d5a701dc3..db677199403c 100644
--- a/trunk/drivers/base/power/main.c
+++ b/trunk/drivers/base/power/main.c
@@ -407,7 +407,7 @@ static void pm_dev_err(struct device *dev, pm_message_t state, char *info,
 static void dpm_show_time(ktime_t starttime, pm_message_t state, char *info)
 {
 	ktime_t calltime;
-	s64 usecs64;
+	u64 usecs64;
 	int usecs;
 
 	calltime = ktime_get();