From: Mark Brown <broonie@linaro.org>
Date: Mon, 17 Jun 2013 16:19:14 +0000 (+0100)
Subject: Merge remote-tracking branch 'spi/topic/pdata' into spi-next
X-Git-Tag: next-20130619~36^2~7
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b17fd784ccfa64d41b29b5832f1f828b22605835;p=karo-tx-linux.git

Merge remote-tracking branch 'spi/topic/pdata' into spi-next
---

b17fd784ccfa64d41b29b5832f1f828b22605835
diff --cc drivers/spi/spi-omap-100k.c
index 9137fcc4f99b,9236764861a9..ee25670f8cfd
--- a/drivers/spi/spi-omap-100k.c
+++ b/drivers/spi/spi-omap-100k.c
@@@ -500,9 -509,8 +500,9 @@@ static int omap1_spi100k_probe(struct p
  	master->cleanup = NULL;
  	master->num_chipselect = 2;
  	master->mode_bits = MODEBITS;
 +	master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32);
  
- 	dev_set_drvdata(&pdev->dev, master);
+ 	platform_set_drvdata(pdev, master);
  
  	spi100k = spi_master_get_devdata(master);
  	spi100k->master = master;