History

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

Linus Torvalds committed 14 years ago

Commit e2f4e0b2 parents af209e0 c65b53b4 files · +6 −4Browse files

Unified · Split

4 files
  1. drivers/spi/Kconfig +2 −2
  2. drivers/spi/spi-ath79.c +1 −0
  3. drivers/spi/spi-gpio.c +2 −2
  4. drivers/spi/spi-nuc900.c +1 −0
drivers/spi/Kconfig+2−2
@@ -199,7 +199,7 @@ config SPI_FSL_LIB · 198 unmodified lines
199 depends on FSL_SOC199 depends on FSL_SOC
200 200
201config SPI_FSL_SPI201config SPI_FSL_SPI
202 tristate "Freescale SPI controller"202 bool "Freescale SPI controller"
203 depends on FSL_SOC203 depends on FSL_SOC
204 select SPI_FSL_LIB204 select SPI_FSL_LIB
205 help205 help
@@ -208,7 +208,7 @@ config SPI_FSL_SPI · 2 unmodified lines
208 MPC8569 uses the controller in QE mode, MPC8610 in cpu mode.208 MPC8569 uses the controller in QE mode, MPC8610 in cpu mode.
209 209
210config SPI_FSL_ESPI210config SPI_FSL_ESPI
211 tristate "Freescale eSPI controller"211 bool "Freescale eSPI controller"
212 depends on FSL_SOC212 depends on FSL_SOC
213 select SPI_FSL_LIB213 select SPI_FSL_LIB
214 help214 help
drivers/spi/spi-ath79.c+1−0
@@ -13,6 +13,7 @@ · 12 unmodified lines
13 */13 */
14 14
15#include <linux/kernel.h>15#include <linux/kernel.h>
16#include <linux/module.h>
16#include <linux/init.h>17#include <linux/init.h>
17#include <linux/delay.h>18#include <linux/delay.h>
18#include <linux/spinlock.h>19#include <linux/spinlock.h>
drivers/spi/spi-gpio.c+2−2
@@ -256,7 +256,7 @@ static void spi_gpio_cleanup(struct spi_device *spi) · 255 unmodified lines
256 spi_bitbang_cleanup(spi);256 spi_bitbang_cleanup(spi);
257}257}
258 258
259static int __init spi_gpio_alloc(unsigned pin, const char *label, bool is_in)259static int __devinit spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
260{260{
261 int value;261 int value;
262 262
@@ -270,7 +270,7 @@ static int __init spi_gpio_alloc(unsigned pin, const char *label, bool is_in) · 7 unmodified lines
270 return value;270 return value;
271}271}
272 272
273static int __init273static int __devinit
274spi_gpio_request(struct spi_gpio_platform_data *pdata, const char *label,274spi_gpio_request(struct spi_gpio_platform_data *pdata, const char *label,
275 u16 *res_flags)275 u16 *res_flags)
276{276{
drivers/spi/spi-nuc900.c+1−0
@@ -8,6 +8,7 @@ · 7 unmodified lines
8 *8 *
9 */9 */
10 10
11#include <linux/module.h>
11#include <linux/init.h>12#include <linux/init.h>
12#include <linux/spinlock.h>13#include <linux/spinlock.h>
13#include <linux/workqueue.h>14#include <linux/workqueue.h>