From: Mark Brown <broonie@linaro.org>
Date: Sun, 30 Mar 2014 00:51:34 +0000 (+0000)
Subject: Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/sc18is602', 'spi/topic... 
X-Git-Tag: v3.15-rc1~147^2~2
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=81235b4ea3aa2e942ac37979433f41b748f12da1

Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/sc18is602', 'spi/topic/sh-hspi', 'spi/topic/sh-msiof', 'spi/topic/sh-sci', 'spi/topic/sirf' and 'spi/topic/spidev' into spi-next
---

81235b4ea3aa2e942ac37979433f41b748f12da1
diff --cc drivers/spi/spi-sh-hspi.c
index 755d7cc9e72f,82d2f922ffa0,82d2f922ffa0,89cfedf6d21a,82d2f922ffa0,82d2f922ffa0,82d2f922ffa0,82d2f922ffa0..9009456bdf4d
--- a/drivers/spi/spi-sh-hspi.c
+++ b/drivers/spi/spi-sh-hspi.c
@@@@@@@@@ -298,9 -298,10 -298,10 -268,8 -298,10 -298,10 -298,10 -298,10 +268,7 @@@@@@@@@ static int hspi_probe(struct platform_d
        
        	pm_runtime_enable(&pdev->dev);
        
 -------	master->num_chipselect	= 1;
        	master->bus_num		= pdev->id;
--- ----	master->setup		= hspi_setup;
--- ----	master->cleanup		= hspi_cleanup;
        	master->mode_bits	= SPI_CPOL | SPI_CPHA;
        	master->dev.of_node	= pdev->dev.of_node;
        	master->auto_runtime_pm = true;