diff --git a/[refs] b/[refs]
index df53ef7aec4c..581bcd9eeb6c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 030bda0d416babd0cf34e584086f815b1c9d417c
+refs/heads/master: 55b1804c678e679e1018671bd40b583eab124689
diff --git a/trunk/include/net/irda/irlan_event.h b/trunk/include/net/irda/irlan_event.h
index 6d9539f05806..018b5a77e610 100644
--- a/trunk/include/net/irda/irlan_event.h
+++ b/trunk/include/net/irda/irlan_event.h
@@ -67,7 +67,7 @@ typedef enum {
 	IRLAN_WATCHDOG_TIMEOUT,
 } IRLAN_EVENT;
 
-extern char *irlan_state[];
+extern const char * const irlan_state[];
 
 void irlan_do_client_event(struct irlan_cb *self, IRLAN_EVENT event, 
 			   struct sk_buff *skb);
diff --git a/trunk/net/irda/irlan/irlan_event.c b/trunk/net/irda/irlan/irlan_event.c
index cbcb4eb54037..43f16040a6fe 100644
--- a/trunk/net/irda/irlan/irlan_event.c
+++ b/trunk/net/irda/irlan/irlan_event.c
@@ -24,7 +24,7 @@
 
 #include <net/irda/irlan_event.h>
 
-char *irlan_state[] = {
+const char * const irlan_state[] = {
 	"IRLAN_IDLE",
 	"IRLAN_QUERY",
 	"IRLAN_CONN",