Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[~andy/linux] / net / wireless / Makefile

diff --git a/net/wireless/Makefile b/net/wireless/Makefile
index cf4e3d9726b804d56f77c86c005c235d496d4ab6..3a96ae60271cf1d79641d6ef155b472cf7889e96 100644 (file)
--- a/net/wireless/Makefile
+++ b/net/wireless/Makefile
@@ -1 +1,4 @@
-# dummy file for now
+obj-$(CONFIG_WIRELESS_EXT) += wext.o
+obj-$(CONFIG_CFG80211) += cfg80211.o
+
+cfg80211-y += core.o sysfs.o