From: Mark Brown <broonie@linaro.org>
Date: Wed, 26 Jun 2013 15:21:02 +0000 (+0100)
Subject: Merge remote-tracking branch 'spi/topic/pdata' into spi-next
X-Git-Tag: v3.11-rc1~110^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3d09da11b59ade74502b246782552f9cb1eb59bd;p=platform%2Fkernel%2Flinux-stable.git

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

3d09da11b59ade74502b246782552f9cb1eb59bd
diff --cc drivers/spi/spi-omap-100k.c
index 9137fcc,9236764..ee25670
--- 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;