diff --git a/[refs] b/[refs]
index 27ce4bb023ba..73955c2ad0f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3b9b6cf1b37522990246ac98267ecfe4bc25222
+refs/heads/master: 8433b143244099a5789c3d3a874e43aef1fd1902
diff --git a/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c b/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c
index 6aaaa2fd57f4..f95967538d37 100644
--- a/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c
+++ b/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c
@@ -18,7 +18,7 @@
 #include <linux/netdevice.h>
 #include <linux/if_ether.h>
 #include <linux/if_arp.h>
-#include <asm/string.h>
+#include <linux/string.h>
 #include <linux/wireless.h>
 
 #include "ieee80211.h"