Merge tag 'v3.13-rc4' into next

Synchronize with mainline to bring in the new keycode definitions and
new hwmon API.

1 files changed, 13 insertions, 25 deletions

diff --git a/include/net/iw_handler.h b/include/net/iw_handler.h
index 5d5a6a4732ef..a830b01baba4 100644
--- a/include/net/iw_handler.h
+++ b/include/net/iw_handler.h
@@ -432,44 +432,32 @@ struct iw_public_data {
 /* First : function strictly used inside the kernel */
 
 /* Handle /proc/net/wireless, called in net/code/dev.c */
-extern int dev_get_wireless_info(char * buffer, char **start, off_t offset,
-                                 int length);
+int dev_get_wireless_info(char *buffer, char **start, off_t offset, int length);
 
 /* Second : functions that may be called by driver modules */
 
 /* Send a single event to user space */
-extern void wireless_send_event(struct net_device *     dev,
-                                unsigned int            cmd,
-                                union iwreq_data *      wrqu,
-                                const char *            extra);
+void wireless_send_event(struct net_device *dev, unsigned int cmd,
+                         union iwreq_data *wrqu, const char *extra);
 
 /* We may need a function to send a stream of events to user space.
  * More on that later... */
 
 /* Standard handler for SIOCSIWSPY */
-extern int iw_handler_set_spy(struct net_device *       dev,
-                              struct iw_request_info *  info,
-                              union iwreq_data *        wrqu,
-                              char *                    extra);
+int iw_handler_set_spy(struct net_device *dev, struct iw_request_info *info,
+                       union iwreq_data *wrqu, char *extra);
 /* Standard handler for SIOCGIWSPY */
-extern int iw_handler_get_spy(struct net_device *       dev,
-                              struct iw_request_info *  info,
-                              union iwreq_data *        wrqu,
-                              char *                    extra);
+int iw_handler_get_spy(struct net_device *dev, struct iw_request_info *info,
+                       union iwreq_data *wrqu, char *extra);
 /* Standard handler for SIOCSIWTHRSPY */
-extern int iw_handler_set_thrspy(struct net_device *    dev,
-                                 struct iw_request_info *info,
-                                 union iwreq_data *     wrqu,
-                                 char *                 extra);
+int iw_handler_set_thrspy(struct net_device *dev, struct iw_request_info *info,
+                          union iwreq_data *wrqu, char *extra);
 /* Standard handler for SIOCGIWTHRSPY */
-extern int iw_handler_get_thrspy(struct net_device *    dev,
-                                 struct iw_request_info *info,
-                                 union iwreq_data *     wrqu,
-                                 char *                 extra);
+int iw_handler_get_thrspy(struct net_device *dev, struct iw_request_info *info,
+                          union iwreq_data *wrqu, char *extra);
 /* Driver call to update spy records */
-extern void wireless_spy_update(struct net_device *     dev,
-                                unsigned char *         address,
-                                struct iw_quality *     wstats);
+void wireless_spy_update(struct net_device *dev, unsigned char *address,
+                         struct iw_quality *wstats);
 
 /************************* INLINE FUNTIONS *************************/
 /*