diff --git a/[refs] b/[refs]
index ec9d04426ecc..b3b834339aad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1716b0fea36c2be628440c1050182a1a1e9caae7
+refs/heads/master: 4fd5463c43d75ec919e27abdcfde1b199c19541e
diff --git a/trunk/include/asm-generic/gpio.h b/trunk/include/asm-generic/gpio.h
index 0f99ad38b012..2c5744b66dec 100644
--- a/trunk/include/asm-generic/gpio.h
+++ b/trunk/include/asm-generic/gpio.h
@@ -61,7 +61,7 @@ struct module;
  * is calculated by subtracting @base from the gpio number.
  */
 struct gpio_chip {
-	char			*label;
+	const char		*label;
 	struct device		*dev;
 	struct module		*owner;