diff --git a/[refs] b/[refs]
index 52bb3e1da7ea..a4426373dd23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6817a2c2ebaaaed95b96cd0f04559ba555f4096
+refs/heads/master: 01a04ddc86f904eff65e1668cf6524a58203fe2d
diff --git a/trunk/drivers/gpio/gpio-mpc8xxx.c b/trunk/drivers/gpio/gpio-mpc8xxx.c
index 5a1817eedd1b..9ae29cc0d17f 100644
--- a/trunk/drivers/gpio/gpio-mpc8xxx.c
+++ b/trunk/drivers/gpio/gpio-mpc8xxx.c
@@ -38,7 +38,7 @@ struct mpc8xxx_gpio_chip {
 	 */
 	u32 data;
 	struct irq_domain *irq;
-	void *of_dev_id_data;
+	const void *of_dev_id_data;
 };
 
 static inline u32 mpc8xxx_gpio2mask(unsigned int gpio)