Merge remote-tracking branch 'spi/topic/fsl' into spi-next

2a5c37ca · Mark Brown · 385daaf0 · d0864323 · 2a5c37ca
Commit 2a5c37ca authored Jun 26, 2013 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/spi/spi-fsl-lib.c drivers/spi/spi-fsl-lib.c +1 -1

No files found.
--- 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);