diff --git a/[refs] b/[refs]
index 56ba6be0de60..eca59540b50d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b446918b77c717a34eaa853dfab55f579d330551
+refs/heads/master: caf66e581172dc5032bb84841a91bc7b77ad9876
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
index a3fccc85b1a0..99914e6fa3fd 100644
--- a/trunk/include/linux/netdevice.h
+++ b/trunk/include/linux/netdevice.h
@@ -136,7 +136,7 @@ static inline bool dev_xmit_complete(int rc)
  *	used.
  */
 
-#if defined(CONFIG_WLAN_80211) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
+#if defined(CONFIG_WLAN) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
 # if defined(CONFIG_MAC80211_MESH)
 #  define LL_MAX_HEADER 128
 # else