diff options
author | David Brownell <david-b@pacbell.net> | 2007-02-20 22:58:19 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-21 02:10:16 +0100 |
commit | bb2d1c36c7f3a78d482622289c8de0c1a5fe790f (patch) | |
tree | 1bb4dc9b173f500b4a130c05eae8ad080699597a /drivers/spi/atmel_spi.c | |
parent | [PATCH] parport_pc: fix parport_pc_probe_port section warning (diff) | |
download | linux-bb2d1c36c7f3a78d482622289c8de0c1a5fe790f.tar.xz linux-bb2d1c36c7f3a78d482622289c8de0c1a5fe790f.zip |
[PATCH] SPI controller build/warning fixes
The signature of the per-device cleanup() routine changed to remove its
const-ness. Three new SPI controller drivers now need that change, to
eliminate build warnings.
This also fixes a build bug with atmel_spi on AT91 systems.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/spi/atmel_spi.c')
-rw-r--r-- | drivers/spi/atmel_spi.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c index c2a9fef58edc..6fa260d1a9be 100644 --- a/drivers/spi/atmel_spi.c +++ b/drivers/spi/atmel_spi.c @@ -23,6 +23,10 @@ #include <asm/arch/board.h> #include <asm/arch/gpio.h> +#ifdef CONFIG_ARCH_AT91 +#include <asm/arch/cpu.h> +#endif + #include "atmel_spi.h" /* @@ -491,7 +495,7 @@ static int atmel_spi_transfer(struct spi_device *spi, struct spi_message *msg) return 0; } -static void atmel_spi_cleanup(const struct spi_device *spi) +static void atmel_spi_cleanup(struct spi_device *spi) { if (spi->controller_state) gpio_free((unsigned int)spi->controller_data); |