---

yaml --- r: 101177 b: refs/heads/master c: 38032f7 h: refs/heads/master i: 101175: 46c25f9 v: v3
git-mirror · Jul 12, 2008 · 1bd2168 · 1bd2168
1 parent 3aa6b26
commit 1bd2168
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;