diff --git a/[refs] b/[refs]
index 83896eff2966..aedd1dd67095 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1e316891693f3e7266a1df9afda72763248ef7c
+refs/heads/master: 6c057573f21db0ef85f78318875269a2159af35c
diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
index 49384ca27eaf..ce555819c8fc 100644
--- a/trunk/drivers/net/Makefile
+++ b/trunk/drivers/net/Makefile
@@ -276,7 +276,7 @@ obj-$(CONFIG_USB_USBNET)        += usb/
 obj-$(CONFIG_USB_ZD1201)        += usb/
 obj-$(CONFIG_USB_IPHETH)        += usb/
 
-obj-y += wireless/
+obj-$(CONFIG_WLAN) += wireless/
 obj-$(CONFIG_NET_TULIP) += tulip/
 obj-$(CONFIG_HAMRADIO) += hamradio/
 obj-$(CONFIG_IRDA) += irda/