diff --git a/[refs] b/[refs] index 82d3f3b7b603..bde3ff79db14 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d4d262769cd1894a0306b9c57e72f005cd9e75a +refs/heads/master: 760fe9ad1692361770bb56fa5c69cf6b3354858c diff --git a/trunk/drivers/misc/ioc4.c b/trunk/drivers/misc/ioc4.c index 79354bbbbd6a..b995a15b7526 100644 --- a/trunk/drivers/misc/ioc4.c +++ b/trunk/drivers/misc/ioc4.c @@ -210,8 +210,8 @@ ioc4_clock_calibrate(struct ioc4_driver_data *idd) do_div(ns, IOC4_EXTINT_COUNT_DIVISOR); printk(KERN_DEBUG - "IOC4 %s: PCI clock is %lld ns.\n", - pci_name(idd->idd_pdev), ns); + "IOC4 %s: PCI clock is %llu ns.\n", + pci_name(idd->idd_pdev), (unsigned long long)ns); } /* Remember results. We store the extint clock period rather