From 1bd2168285e6f40b056f1790f4f1842121787e74 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Fri, 11 Jul 2008 12:57:31 -0700
Subject: [PATCH] --- yaml --- r: 101177 b: refs/heads/master c:
 38032f72601deac7aab00691c79e83d09b204e2a h: refs/heads/master i:   101175:
 46c25f9cde6efd012bc274f985806b8c3a4ab665 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/clocksource/acpi_pm.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0adf199b306c..f7d2efe4fa6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b148507d3d042a3c11f4c3f6c0f649c6a89220d
+refs/heads/master: 38032f72601deac7aab00691c79e83d09b204e2a
diff --git a/trunk/drivers/clocksource/acpi_pm.c b/trunk/drivers/clocksource/acpi_pm.c
index 3baee020afc2..bcd7d0e429e8 100644
--- a/trunk/drivers/clocksource/acpi_pm.c
+++ b/trunk/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%04x\n",
+	       (unsigned int)pmtmr_ioport, base);
 	pmtmr_ioport = base;
 
 	return 1;