diff --git a/[refs] b/[refs]
index c025b4dfcdcc..c50b368ce530 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5039a86973cd35bdb2f64d28ee12f13fe2bb5a4c
+refs/heads/master: cc4d22ae541ccd989ef163c46a38afde131e1644
diff --git a/trunk/drivers/spi/spi-imx.c b/trunk/drivers/spi/spi-imx.c
index 31054e3de4c1..373f4fff9358 100644
--- a/trunk/drivers/spi/spi-imx.c
+++ b/trunk/drivers/spi/spi-imx.c
@@ -83,7 +83,7 @@ struct spi_imx_data {
 	struct spi_bitbang bitbang;
 
 	struct completion xfer_done;
-	void *base;
+	void __iomem *base;
 	int irq;
 	struct clk *clk;
 	unsigned long spi_clk;