summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2012-10-16 16:40:53 +1000
committerDave Airlie <airlied@redhat.com>2012-10-16 16:40:53 +1000
commit8a00b6af4cc547725f231c8367ddc7cb56b2cf76 (patch)
treed94385a9c8960eec0b1ea72380e80555116e0ebf /drivers
parent30f02cb7dd2e6a677c1d5ccd614024f2ebec8f1b (diff)
downloadlinux-3.10-8a00b6af4cc547725f231c8367ddc7cb56b2cf76.tar.gz
linux-3.10-8a00b6af4cc547725f231c8367ddc7cb56b2cf76.tar.bz2
linux-3.10-8a00b6af4cc547725f231c8367ddc7cb56b2cf76.zip
nouveau: fix warning on 32-bit build.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/therm/fan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c b/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c
index b29237970fa..52317868518 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c
@@ -134,7 +134,7 @@ nouveau_therm_fan_sense(struct nouveau_therm *therm)
end = ptimer->read(ptimer);
if (cycles == 5) {
- tach = (u64)60000000000;
+ tach = (u64)60000000000ULL;
do_div(tach, (end - start));
return tach;
} else