Merge branch 'spi/for-3.2' of git://git.pengutronix.de/git/wsa/linux-2.6

torvalds · torvalds · commit e2f4e0bc2aaf · 2011-12-09T14:41:50.000-08:00
* 'spi/for-3.2' of git://git.pengutronix.de/git/wsa/linux-2.6:
  spi/gpio: fix section mismatch warning
  spi/fsl-espi: disable CONFIG_SPI_FSL_ESPI=m build
  spi/nuc900: Include linux/module.h
  spi/ath79: fix compile error due to missing include
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
@@ -199,7 +199,7 @@ config SPI_FSL_LIB
 	depends on FSL_SOC
 
 config SPI_FSL_SPI
-	tristate "Freescale SPI controller"
+	bool "Freescale SPI controller"
 	depends on FSL_SOC
 	select SPI_FSL_LIB
 	help
@@ -208,7 +208,7 @@ config SPI_FSL_SPI
 	  MPC8569 uses the controller in QE mode, MPC8610 in cpu mode.
 
 config SPI_FSL_ESPI
-	tristate "Freescale eSPI controller"
+	bool "Freescale eSPI controller"
 	depends on FSL_SOC
 	select SPI_FSL_LIB
 	help
diff --git a/drivers/spi/spi-ath79.c b/drivers/spi/spi-ath79.c
@@ -13,6 +13,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/spinlock.h>
diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c
@@ -256,7 +256,7 @@ static void spi_gpio_cleanup(struct spi_device *spi)
 	spi_bitbang_cleanup(spi);
 }
 
-static int __init spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
+static int __devinit spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
 {
 	int value;
 
@@ -270,7 +270,7 @@ static int __init spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
 	return value;
 }
 
-static int __init
+static int __devinit
 spi_gpio_request(struct spi_gpio_platform_data *pdata, const char *label,
 	u16 *res_flags)
 {
diff --git a/drivers/spi/spi-nuc900.c b/drivers/spi/spi-nuc900.c
@@ -8,6 +8,7 @@
  *
  */
 
+#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ static void spi_gpio_cleanup(struct spi_device *spi)`
`256`	`256`	`spi_bitbang_cleanup(spi);`
`257`	`257`	`}`
`258`	`258`
`259`		`-static int __init spi_gpio_alloc(unsigned pin, const char *label, bool is_in)`
	`259`	`+static int __devinit spi_gpio_alloc(unsigned pin, const char *label, bool is_in)`
`260`	`260`	`{`
`261`	`261`	`int value;`
`262`	`262`
`@@ -270,7 +270,7 @@ static int __init spi_gpio_alloc(unsigned pin, const char *label, bool is_in)`
`270`	`270`	`return value;`
`271`	`271`	`}`
`272`	`272`
`273`		`-static int __init`
	`273`	`+static int __devinit`
`274`	`274`	`spi_gpio_request(struct spi_gpio_platform_data pdata, const char label,`
`275`	`275`	`u16 *res_flags)`
`276`	`276`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*/`
`10`	`10`
	`11`	`+#include <linux/module.h>`
`11`	`12`	`#include <linux/init.h>`
`12`	`13`	`#include <linux/spinlock.h>`
`13`	`14`	`#include <linux/workqueue.h>`