commit 8a00b6af4cc547725f231c8367ddc7cb56b2cf76
author Dave Airlie <airlied@redhat.com> Tue Oct 16 16:40:53 2012 +1000
committer Dave Airlie <airlied@redhat.com> Tue Oct 16 16:40:53 2012 +1000
tree d94385a9c8960eec0b1ea72380e80555116e0ebf
parent 30f02cb7dd2e6a677c1d5ccd614024f2ebec8f1b

nouveau: fix warning on 32-bit build.

Signed-off-by: Dave Airlie <airlied@redhat.com>

drivers/gpu/drm/nouveau/core/subdev/therm/fan.c

diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c b/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c
index b292379..5231786 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 @@
 	end = ptimer->read(ptimer);
 
 	if (cycles == 5) {
-		tach = (u64)60000000000;
+		tach = (u64)60000000000ULL;
 		do_div(tach, (end - start));
 		return tach;
 	} else