aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/drivers/spi/spi-fsl-lib.c
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-08-15 11:11:45 -0700
committerSage Weil <sage@inktank.com>2013-08-15 11:11:45 -0700
commitee3e542fec6e69bc9fb668698889a37d93950ddf (patch)
treee74ee766a4764769ef1d3d45d266b4dea64101d3 /drivers/spi/spi-fsl-lib.c
parentceph: Remove bogus check in invalidatepage (diff)
parentMerge branch 'akpm' (patches from Andrew Morton) (diff)
downloadwireguard-linux-ee3e542fec6e69bc9fb668698889a37d93950ddf.tar.xz
wireguard-linux-ee3e542fec6e69bc9fb668698889a37d93950ddf.zip
Merge remote-tracking branch 'linus/master' into testing
Diffstat (limited to 'drivers/spi/spi-fsl-lib.c')
-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);