diff --git a/[refs] b/[refs]
index c806f153974e..d811f3d76c02 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39550d282342357e1d4227b4bc5b94fb9b1ab975
+refs/heads/master: 3c304fe63bdd8bfebfcc9196467cd787355bd4d5
diff --git a/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_module.c b/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_module.c
index 0ed4c93f3c89..66b4833a503f 100644
--- a/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_module.c
+++ b/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_module.c
@@ -69,8 +69,7 @@ static inline int ieee80211_networks_allocate(struct ieee80211_device *ieee)
 		MAX_NETWORK_COUNT, sizeof(struct ieee80211_network),
 		GFP_KERNEL);
 	if (!ieee->networks) {
-		printk(KERN_WARNING "%s: Out of memory allocating beacons\n",
-		       ieee->dev->name);
+		netdev_warn(ieee->dev,  "Out of memory allocating beacons\n");
 		return -ENOMEM;
 	}