[ACPI] Merge acpi-2.6.12 branch into 2.6.13-rc3

[firefly-linux-kernel-4.4.55.git] / drivers / char / hpet.c

diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index a8d4c47f7add228b7dd7867120dcafdba14b507a..97feb7f7024d83e4180ba2477f89f7fa59445b5f 100644 (file)
--- a/drivers/char/hpet.c
+++ b/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);