diff --git a/[refs] b/[refs]
index a628bee217a3..04c99725233a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ca2cc728d8060d58518096e5c79f12e3775c33a
+refs/heads/master: 3262a8f2bf686ced3a6ce8dee013ddf85511fbb6
diff --git a/trunk/arch/ia64/sn/kernel/io_acpi_init.c b/trunk/arch/ia64/sn/kernel/io_acpi_init.c
index a15baacaba43..bc610a6c7851 100644
--- a/trunk/arch/ia64/sn/kernel/io_acpi_init.c
+++ b/trunk/arch/ia64/sn/kernel/io_acpi_init.c
@@ -357,7 +357,7 @@ sn_acpi_get_pcidev_info(struct pci_dev *dev, struct pcidev_info **pcidev_info,
         if (ACPI_SUCCESS(status)) {
 		if (segment != pci_domain_nr(dev)) {
 			printk(KERN_ERR
-			       "%s: Segment number mismatch, 0x%lx vs 0x%x for: ",
+			       "%s: Segment number mismatch, 0x%llx vs 0x%x for: ",
 			       __func__, segment, pci_domain_nr(dev));
 			acpi_ns_print_node_pathname(rootbus_handle, NULL);
 			printk("\n");