summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-25 09:51:38 +0100
committerMark Brown <broonie@linaro.org>2013-10-25 09:51:38 +0100
commitd448121c4c6db34cd73256bf6eb5a97c62e18e7b (patch)
tree439bac044644baf79af450c96dab5fb2b3da973f /drivers/spi
parentad14ad735f48ca39e5de8dc7a9186509e7c196e3 (diff)
parentcfeb33127bfd5c248c8633715d75c04186d8fca9 (diff)
downloadtalos-obmc-linux-d448121c4c6db34cd73256bf6eb5a97c62e18e7b.tar.gz
talos-obmc-linux-d448121c4c6db34cd73256bf6eb5a97c62e18e7b.zip
Merge remote-tracking branch 'spi/topic/s3c24xx' into spi-next
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-s3c24xx.c2
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)
* so the caller does not need to do anything more than start the transfer
* as normal, since the IRQ will have been re-routed to the FIQ handler.
*/
-void s3c24xx_spi_tryfiq(struct s3c24xx_spi *hw)
+static void s3c24xx_spi_tryfiq(struct s3c24xx_spi *hw)
{
struct pt_regs regs;
enum spi_fiq_mode mode;
OpenPOWER on IntegriCloud