diff --git a/[refs] b/[refs]
index cfef80589a6f..9ca0a8f32af0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0575606b086ad216b7b1976ca9b9a6e711db92f0
+refs/heads/master: 5121ea0481f9cea1dfd958f18d7b4ac78778cd40
diff --git a/trunk/include/net/iw_handler.h b/trunk/include/net/iw_handler.h
index 51b9a37de991..2b3fbbb8669e 100644
--- a/trunk/include/net/iw_handler.h
+++ b/trunk/include/net/iw_handler.h
@@ -443,7 +443,7 @@ extern int dev_get_wireless_info(char * buffer, char **start, off_t offset,
 extern void wireless_send_event(struct net_device *	dev,
 				unsigned int		cmd,
 				union iwreq_data *	wrqu,
-				char *			extra);
+				const char *		extra);
 
 /* We may need a function to send a stream of events to user space.
  * More on that later... */
diff --git a/trunk/net/wireless/wext.c b/trunk/net/wireless/wext.c
index 5da07e079c20..425f7d58b961 100644
--- a/trunk/net/wireless/wext.c
+++ b/trunk/net/wireless/wext.c
@@ -1376,7 +1376,7 @@ static void rtmsg_iwinfo(struct net_device *dev, char *event, int event_len)
 void wireless_send_event(struct net_device *	dev,
 			 unsigned int		cmd,
 			 union iwreq_data *	wrqu,
-			 char *			extra)
+			 const char *		extra)
 {
 	const struct iw_ioctl_description *	descr = NULL;
 	int extra_len = 0;