From 127fd5cbb889785e9f5bc4a4bae12c36addd98ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
Date: Thu, 29 Mar 2012 21:54:18 +0200
Subject: [PATCH] --- yaml --- r: 299169 b: refs/heads/master c:
 cc4d22ae541ccd989ef163c46a38afde131e1644 h: refs/heads/master i:   299167:
 d06d8b525ec71854c658da2744696fc5d266dcb3 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/spi/spi-imx.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;