summaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-06-26 19:20:59 +0400
committerMark Brown <broonie@linaro.org>2013-06-26 19:20:59 +0400
commit2a5c37cab3625cd5a16c01df82da5e70bd0bcc4e (patch)
treefa30f6d3207761bfbfd1a1f3c9fe460e19f64905 /drivers/spi
parent385daaf0a8c1d35d9c07454b3f7a3b4560bfae76 (diff)
parentd08643237382bb0107a2d03b4e1986852414aa85 (diff)
downloadlinux-2a5c37cab3625cd5a16c01df82da5e70bd0bcc4e.tar.xz
Merge remote-tracking branch 'spi/topic/fsl' into spi-next
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-fsl-lib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-fsl-lib.c b/drivers/spi/spi-fsl-lib.c
index a91db0e57b23..e947f2d1b2f5 100644
--- a/drivers/spi/spi-fsl-lib.c
+++ b/drivers/spi/spi-fsl-lib.c
@@ -61,7 +61,7 @@ struct mpc8xxx_spi_probe_info *to_of_pinfo(struct fsl_spi_platform_data *pdata)
return container_of(pdata, struct mpc8xxx_spi_probe_info, pdata);
}
-void mpc8xxx_spi_work(struct work_struct *work)
+static void mpc8xxx_spi_work(struct work_struct *work)
{
struct mpc8xxx_spi *mpc8xxx_spi = container_of(work, struct mpc8xxx_spi,
work);