diff --git a/[refs] b/[refs]
index 75ae1f6cd973..e64b6e6819cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 417328c3f77187f5d8cc433627c25eb1063c1507
+refs/heads/master: 983290b0625628448ea8907243e3cbceda0a8d74
diff --git a/trunk/drivers/pwm/pwm-imx.c b/trunk/drivers/pwm/pwm-imx.c
index 8a5d3ae2946a..fe3fbdbc86aa 100644
--- a/trunk/drivers/pwm/pwm-imx.c
+++ b/trunk/drivers/pwm/pwm-imx.c
@@ -235,7 +235,7 @@ static int __devinit imx_pwm_probe(struct platform_device *pdev)
 {
 	const struct of_device_id *of_id =
 			of_match_device(imx_pwm_dt_ids, &pdev->dev);
-	struct imx_pwm_data *data;
+	const struct imx_pwm_data *data;
 	struct imx_chip *imx;
 	struct resource *r;
 	int ret = 0;