diff --git a/[refs] b/[refs]
index b84d487718f2..9ed7d2ac51ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 023dcd25ce409506f992f9e3a822424de035fe05
+refs/heads/master: 4deb508e91624ab0ff1812825870c7dcf7812690
diff --git a/trunk/drivers/parisc/superio.c b/trunk/drivers/parisc/superio.c
index e3b76d409dee..5003458980d3 100644
--- a/trunk/drivers/parisc/superio.c
+++ b/trunk/drivers/parisc/superio.c
@@ -348,7 +348,7 @@ int superio_fixup_irq(struct pci_dev *pcidev)
 		BUG();
 		return -1;
 	}
-	printk("superio_fixup_irq(%s) ven 0x%x dev 0x%x from %p\n",
+	printk("superio_fixup_irq(%s) ven 0x%x dev 0x%x from %pf\n",
 		pci_name(pcidev),
 		pcidev->vendor, pcidev->device,
 		__builtin_return_address(0));