AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-01-19 13:26:11 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* '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
This commit is contained in:
Linus Torvalds 2011-12-09 14:41:50 -08:00
commit e2f4e0bc2a
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/spi/Kconfig
View File

@ -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

1
drivers/spi/spi-ath79.c
View File

@ -13,6 +13,7 @@
*/
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/spinlock.h>

4
drivers/spi/spi-gpio.c
View File

@ -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)
{

1
drivers/spi/spi-nuc900.c
View File

@ -8,6 +8,7 @@
*
*/
#include <linux/module.h>
#include <linux/init.h>
#include <linux/spinlock.h>
#include <linux/workqueue.h>