diff --git a/[refs] b/[refs]
index 708f95e4da5b..ad879bf0395c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80023cb354725cd3319d81a8d7e6f88ad0253cfa
+refs/heads/master: 83a01e729141bfad5e249b4a737105c525f53786
diff --git a/trunk/drivers/spi/spi-omap2-mcspi.c b/trunk/drivers/spi/spi-omap2-mcspi.c
index bc4778175e34..d80f81b6c844 100644
--- a/trunk/drivers/spi/spi-omap2-mcspi.c
+++ b/trunk/drivers/spi/spi-omap2-mcspi.c
@@ -1116,7 +1116,7 @@ MODULE_DEVICE_TABLE(of, omap_mcspi_of_match);
 static int __devinit omap2_mcspi_probe(struct platform_device *pdev)
 {
 	struct spi_master	*master;
-	struct omap2_mcspi_platform_config *pdata;
+	const struct omap2_mcspi_platform_config *pdata;
 	struct omap2_mcspi	*mcspi;
 	struct resource		*r;
 	int			status = 0, i;