Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2f4e0bc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* '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
parents af209e0a c65b53ba

drivers/spi/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -199,7 +199,7 @@ config SPI_FSL_LIB 
	depends on FSL_SOC

	depends on FSL_SOC





config SPI_FSL_SPI

config SPI_FSL_SPI

	tristate "Freescale SPI controller"

	bool "Freescale SPI controller"

	depends on FSL_SOC

	depends on FSL_SOC

	select SPI_FSL_LIB

	select SPI_FSL_LIB

	help

	help
@@ -208,7 +208,7 @@ config SPI_FSL_SPI 
	  MPC8569 uses the controller in QE mode, MPC8610 in cpu mode.

	  MPC8569 uses the controller in QE mode, MPC8610 in cpu mode.





config SPI_FSL_ESPI

config SPI_FSL_ESPI

	tristate "Freescale eSPI controller"

	bool "Freescale eSPI controller"

	depends on FSL_SOC

	depends on FSL_SOC

	select SPI_FSL_LIB

	select SPI_FSL_LIB

	help

	help

drivers/spi/spi-ath79.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -13,6 +13,7 @@ 
 */

 */





#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/spinlock.h>

#include <linux/spinlock.h>

drivers/spi/spi-gpio.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -256,7 +256,7 @@ static void spi_gpio_cleanup(struct spi_device *spi) 
	spi_bitbang_cleanup(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;

	int value;
@@ -270,7 +270,7 @@ static int __init spi_gpio_alloc(unsigned pin, const char *label, bool is_in) 
	return value;

	return value;

}

}





static int __init

static int __devinit

spi_gpio_request(struct spi_gpio_platform_data *pdata, const char *label,

spi_gpio_request(struct spi_gpio_platform_data *pdata, const char *label,

	u16 *res_flags)

	u16 *res_flags)

{

{

drivers/spi/spi-nuc900.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -8,6 +8,7 @@ 
 *

 *

 */

 */





#include <linux/module.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/spinlock.h>

#include <linux/spinlock.h>

#include <linux/workqueue.h>

#include <linux/workqueue.h>