From f1d7c9df1879f4e8f1a64f6fb47519e3056b45ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
Date: Thu, 1 Oct 2009 15:44:31 -0700
Subject: [PATCH] --- yaml --- r: 166674 b: refs/heads/master c:
 4388eb11351660c7688a4756aa6da99bfb4bc129 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/spi/spi_imx.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0577e304b4d3..efb602d44bf3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3910f2cff90f447e37d32f8f7d60566042b8bdbe
+refs/heads/master: 4388eb11351660c7688a4756aa6da99bfb4bc129
diff --git a/trunk/drivers/spi/spi_imx.c b/trunk/drivers/spi/spi_imx.c
index 84dd4f3bd50e..b6a8149220fb 100644
--- a/trunk/drivers/spi/spi_imx.c
+++ b/trunk/drivers/spi/spi_imx.c
@@ -481,9 +481,6 @@ static int spi_imx_setup(struct spi_device *spi)
 	struct spi_imx_data *spi_imx = spi_master_get_devdata(spi->master);
 	int gpio = spi_imx->chipselect[spi->chip_select];
 
-	if (!spi->bits_per_word)
-		spi->bits_per_word = 8;
-
 	pr_debug("%s: mode %d, %u bpw, %d hz\n", __func__,
 		 spi->mode, spi->bits_per_word, spi->max_speed_hz);