From f45855abde18125957b83e3beee6b28ab5a0beb2 Mon Sep 17 00:00:00 2001
From: Nicolas Kaiser <nikai@nikai.net>
Date: Sun, 27 Jun 2010 11:44:52 +0000
Subject: [PATCH] --- yaml --- r: 203221 b: refs/heads/master c:
 6c057573f21db0ef85f78318875269a2159af35c h: refs/heads/master i:   203219:
 afe2127103821abca1ea56dde060cd01d05e9278 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/net/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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/