diff --git a/[refs] b/[refs]
index 8bee7c15700a..cd2e5c0584e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 903dba1eae49270a8c2275636071c3a238c8104d
+refs/heads/master: b04b4f7862de8d6e8b536853aaf66a6c1bb05cbd
diff --git a/trunk/sound/parisc/harmony.c b/trunk/sound/parisc/harmony.c
index 6055fd6d3b38..63ae0f9aeaf5 100644
--- a/trunk/sound/parisc/harmony.c
+++ b/trunk/sound/parisc/harmony.c
@@ -935,7 +935,7 @@ snd_harmony_create(struct snd_card *card,
 	h->iobase = ioremap_nocache(padev->hpa.start, HARMONY_SIZE);
 	if (h->iobase == NULL) {
 		printk(KERN_ERR PFX "unable to remap hpa 0x%lx\n",
-		       padev->hpa.start);
+		       (unsigned long)padev->hpa.start);
 		err = -EBUSY;
 		goto free_and_ret;
 	}