From 1a0ca53ac17405a4dac7cc4a407659473f8e1bec Mon Sep 17 00:00:00 2001
From: Scott Jiang <scott.jiang.linux@gmail.com>
Date: Mon, 23 Apr 2012 18:18:10 -0400
Subject: [PATCH] --- yaml --- r: 299759 b: refs/heads/master c:
 7666fd8b02af87a8b672b00d47e56d77f709127e h: refs/heads/master i:   299757:
 5086844993ccabed43ae1a2abc9a996a818a1baa   299755:
 c7755bf07e66ef56ca88a08415954b4c4c900588   299751:
 587dcaf3c346cd9aedc8d227ca7ae5b6fd6a5107   299743:
 07afeb9435decc32aa434b5c8fbe103187543b94 v: v3

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

diff --git a/[refs] b/[refs]
index 606f72313bbd..bb843c456e5f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 488e1a9de27f0a299fc185f0b5c67246a3f0c6c9
+refs/heads/master: 7666fd8b02af87a8b672b00d47e56d77f709127e
diff --git a/trunk/drivers/spi/spi-bfin5xx.c b/trunk/drivers/spi/spi-bfin5xx.c
index 3b83ff8b1e2b..c0cdcb7c8135 100644
--- a/trunk/drivers/spi/spi-bfin5xx.c
+++ b/trunk/drivers/spi/spi-bfin5xx.c
@@ -1026,7 +1026,6 @@ static int bfin_spi_setup(struct spi_device *spi)
 		chip->cs_chg_udelay = chip_info->cs_chg_udelay;
 		chip->idle_tx_val = chip_info->idle_tx_val;
 		chip->pio_interrupt = chip_info->pio_interrupt;
-		spi->bits_per_word = chip_info->bits_per_word;
 	} else {
 		/* force a default base state */
 		chip->ctl_reg &= bfin_ctl_reg;