diff --git a/[refs] b/[refs]
index 1eb85171e5d4..900d38ae8320 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8174fc04e8e71b3969a45c9be288f6535d6b90d3
+refs/heads/master: d268e0d28165340c3799a8a4944bc40f444f49fd
diff --git a/trunk/drivers/staging/wlags49_h2/wl_sysfs.h b/trunk/drivers/staging/wlags49_h2/wl_sysfs.h
index 6d96d03cf490..fa658c38001e 100644
--- a/trunk/drivers/staging/wlags49_h2/wl_sysfs.h
+++ b/trunk/drivers/staging/wlags49_h2/wl_sysfs.h
@@ -2,6 +2,6 @@
 extern void register_wlags_sysfs(struct net_device *);
 extern void unregister_wlags_sysfs(struct net_device *);
 #else
-static void register_wlags_sysfs(struct net_device *) { return; };
-static void unregister_wlags_sysfs(struct net_device *) { return; };
+static inline void register_wlags_sysfs(struct net_device *net) { }
+static inline void unregister_wlags_sysfs(struct net_device *net) { }
 #endif