diff --git a/[refs] b/[refs]
index 8bd523a22b99..cf299b792522 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 937041e21634ffecc92d05cf693423a2c95b7252
+refs/heads/master: 920712af498a3081a9ac8256951d1c7eae109c50
diff --git a/trunk/drivers/spi/xilinx_spi.c b/trunk/drivers/spi/xilinx_spi.c
index b927812822c1..9f386379c169 100644
--- a/trunk/drivers/spi/xilinx_spi.c
+++ b/trunk/drivers/spi/xilinx_spi.c
@@ -408,8 +408,8 @@ struct spi_master *xilinx_spi_init(struct device *dev, struct resource *mem,
 		goto free_irq;
 	}
 
-	dev_info(dev, "at 0x%08X mapped to 0x%08X, irq=%d\n",
-		(u32)mem->start, (u32)xspi->regs, xspi->irq);
+	dev_info(dev, "at 0x%08llX mapped to 0x%p, irq=%d\n",
+		(unsigned long long)mem->start, xspi->regs, xspi->irq);
 	return master;
 
 free_irq: