diff --git a/[refs] b/[refs]
index 6b30c137b267..c2c675cb1331 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6283d58e7464f82b1c1c33943f0bd51c1e83899a
+refs/heads/master: 44f410a7ce593e7e75667b93494223998069f3f1
diff --git a/trunk/drivers/char/hpet.c b/trunk/drivers/char/hpet.c
index 5ec732e6ca92..762fa430fb5b 100644
--- a/trunk/drivers/char/hpet.c
+++ b/trunk/drivers/char/hpet.c
@@ -834,7 +834,7 @@ int hpet_alloc(struct hpet_data *hdp)
 	printk("\n");
 
 	ns = hpetp->hp_period;	/* femptoseconds, 10^-15 */
-	do_div(ns, 1000000);	/* convert to nanoseconds, 10^-9 */
+	ns /= 1000000;		/* convert to nanoseconds, 10^-9 */
 	printk(KERN_INFO "hpet%d: %ldns tick, %d %d-bit timers\n",
 		hpetp->hp_which, ns, hpetp->hp_ntimer,
 		cap & HPET_COUNTER_SIZE_MASK ? 64 : 32);