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();