From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 20 Feb 2013 03:41:07 +0000 (+1100)
Subject: Merge remote-tracking branch 'spi/spi/next'
X-Git-Tag: next-20130220~39
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3b8e214c284bfb8a335ff8b228d76b2b409ef0b2;p=karo-tx-linux.git

Merge remote-tracking branch 'spi/spi/next'

Conflicts:
	drivers/spi/spi-s3c64xx.c
---

3b8e214c284bfb8a335ff8b228d76b2b409ef0b2
diff --cc drivers/spi/spi-s3c64xx.c
index 51a8c4216ebb,8f492ed317cc..7cfbe9d3381f
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@@ -1150,10 -1191,9 +1146,10 @@@ static inline struct s3c64xx_spi_port_c
  			 platform_get_device_id(pdev)->driver_data;
  }
  
- static int __init s3c64xx_spi_probe(struct platform_device *pdev)
+ static int s3c64xx_spi_probe(struct platform_device *pdev)
  {
  	struct resource	*mem_res;
 +	struct resource	*res;
  	struct s3c64xx_spi_driver_data *sdd;
  	struct s3c64xx_spi_info *sci = pdev->dev.platform_data;
  	struct spi_master *master;