* '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
Unified · Split
| @@ -199,7 +199,7 @@ config SPI_FSL_LIB · 198 unmodified lines | ||
| 199 | 199 | depends on FSL_SOC |
| 200 | 200 | |
| 201 | 201 | config SPI_FSL_SPI |
| 202 | − tristate "Freescale SPI controller" | |
| 202 | + bool "Freescale SPI controller" | |
| 203 | 203 | depends on FSL_SOC |
| 204 | 204 | select SPI_FSL_LIB |
| 205 | 205 | help |
| @@ -208,7 +208,7 @@ config SPI_FSL_SPI · 2 unmodified lines | ||
| 208 | 208 | MPC8569 uses the controller in QE mode, MPC8610 in cpu mode. |
| 209 | 209 | |
| 210 | 210 | config SPI_FSL_ESPI |
| 211 | − tristate "Freescale eSPI controller" | |
| 211 | + bool "Freescale eSPI controller" | |
| 212 | 212 | depends on FSL_SOC |
| 213 | 213 | select SPI_FSL_LIB |
| 214 | 214 | help |
| @@ -13,6 +13,7 @@ · 12 unmodified lines | ||
| 13 | 13 | */ |
| 14 | 14 | |
| 15 | 15 | #include <linux/kernel.h> |
| 16 | +#include <linux/module.h> | |
| 16 | 17 | #include <linux/init.h> |
| 17 | 18 | #include <linux/delay.h> |
| 18 | 19 | #include <linux/spinlock.h> |
| @@ -256,7 +256,7 @@ static void spi_gpio_cleanup(struct spi_device *spi) · 255 unmodified lines | ||
| 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) · 7 unmodified lines | ||
| 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 | { |
| @@ -8,6 +8,7 @@ · 7 unmodified lines | ||
| 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> |