Merge branches 'x86/urgent', 'x86/amd-iommu', 'x86/apic', 'x86/cleanups', 'x86/core...

[linux-2.6] / drivers / clocksource / acpi_pm.c

diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c
index 3baee020afc29802a648fa45af5284b0aa75b7ce..5ca1d80de182bfa3bb333f0aeca907f7929ed26c 100644 (file)
--- a/drivers/clocksource/acpi_pm.c
+++ b/drivers/clocksource/acpi_pm.c
@@ -227,8 +227,8 @@ static int __init parse_pmtmr(char *arg)
        if (strict_strtoul(arg, 16, &base))
                return -EINVAL;
 
-       printk(KERN_INFO "PMTMR IOPort override: 0x%04lx -> 0x%04lx\n",
-              pmtmr_ioport, base);
+       printk(KERN_INFO "PMTMR IOPort override: 0x%04x -> 0x%04lx\n",
+              (unsigned int)pmtmr_ioport, base);
        pmtmr_ioport = base;
 
        return 1;