diff options
author | Mark Brown <broonie@linaro.org> | 2013-10-25 04:51:38 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-10-25 04:51:38 -0400 |
commit | d448121c4c6db34cd73256bf6eb5a97c62e18e7b (patch) | |
tree | 439bac044644baf79af450c96dab5fb2b3da973f | |
parent | ad14ad735f48ca39e5de8dc7a9186509e7c196e3 (diff) | |
parent | cfeb33127bfd5c248c8633715d75c04186d8fca9 (diff) |
Merge remote-tracking branch 'spi/topic/s3c24xx' into spi-next
-rw-r--r-- | drivers/spi/spi-s3c24xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-s3c24xx.c b/drivers/spi/spi-s3c24xx.c index c9cfdfaf7523..0dc32a11bd3c 100644 --- a/drivers/spi/spi-s3c24xx.c +++ b/drivers/spi/spi-s3c24xx.c | |||
@@ -280,7 +280,7 @@ static inline u32 ack_bit(unsigned int irq) | |||
280 | * so the caller does not need to do anything more than start the transfer | 280 | * so the caller does not need to do anything more than start the transfer |
281 | * as normal, since the IRQ will have been re-routed to the FIQ handler. | 281 | * as normal, since the IRQ will have been re-routed to the FIQ handler. |
282 | */ | 282 | */ |
283 | void s3c24xx_spi_tryfiq(struct s3c24xx_spi *hw) | 283 | static void s3c24xx_spi_tryfiq(struct s3c24xx_spi *hw) |
284 | { | 284 | { |
285 | struct pt_regs regs; | 285 | struct pt_regs regs; |
286 | enum spi_fiq_mode mode; | 286 | enum spi_fiq_mode mode; |