diff --git a/[refs] b/[refs]
index 3767bd98fc88..22520a4cdfed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 132e9306beedd049bc5de037f1996731a2ca3eed
+refs/heads/master: 326bb8a5a12c6298a6bf6c74af490b1858b2f12c
diff --git a/trunk/include/linux/leds.h b/trunk/include/linux/leds.h
index d41ccb56146a..d3a73f5a48c3 100644
--- a/trunk/include/linux/leds.h
+++ b/trunk/include/linux/leds.h
@@ -123,7 +123,7 @@ extern void ledtrig_ide_activity(void);
  */
 struct led_info {
 	const char	*name;
-	char		*default_trigger;
+	const char	*default_trigger;
 	int		flags;
 };
 
@@ -135,7 +135,7 @@ struct led_platform_data {
 /* For the leds-gpio driver */
 struct gpio_led {
 	const char *name;
-	char *default_trigger;
+	const char *default_trigger;
 	unsigned 	gpio;
 	u8 		active_low;
 };