diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-05 14:13:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-05 14:13:36 -0700 |
| commit | 68762f3d8e7ea644fae1f490f9850ebf462548bd (patch) | |
| tree | 81be52e9ba33fc4d8aa5f569aaab77b5a34e09ab /net/Makefile | |
| parent | 4f7a307dc6e4d8bfeb56f7cf7231b08cb845687c (diff) | |
| parent | 7544b0972c1fc1a0e6c54baa1f44c81019743daa (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[TG3]: Add TG3_FLAG_SUPPORT_MSI flag.
[TG3]: Eliminate the TG3_FLAG_5701_REG_WRITE_BUG flag.
[TG3]: Eliminate the TG3_FLAG_GOT_SERDES_FLOWCTL flag.
[TG3]: Remove reset during MAC address changes.
[TG3]: WoL fixes.
[TG3]: Clear GPIO mask before storing.
[TG3]: Improve NVRAM sizing.
[TG3]: Fix TSO bugs.
[MAC80211]: Add maintainers entry for mac80211.
[MAC80211]: Add debugfs attributes.
[MAC80211]: Add mac80211 wireless stack.
[MAC80211]: Add generic include/linux/ieee80211.h
[NETLINK]: Remove references to process ID
[AF_IUCV]: Compile fix - adopt to skbuff changes.
Diffstat (limited to 'net/Makefile')
| -rw-r--r-- | net/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/Makefile b/net/Makefile index 6b74d4118c5..9fdb60c2e4a 100644 --- a/net/Makefile +++ b/net/Makefile @@ -45,6 +45,8 @@ obj-$(CONFIG_ECONET) += econet/ obj-$(CONFIG_VLAN_8021Q) += 8021q/ obj-$(CONFIG_IP_DCCP) += dccp/ obj-$(CONFIG_IP_SCTP) += sctp/ +obj-y += wireless/ +obj-$(CONFIG_MAC80211) += mac80211/ obj-$(CONFIG_IEEE80211) += ieee80211/ obj-$(CONFIG_TIPC) += tipc/ obj-$(CONFIG_NETLABEL) += netlabel/ @@ -53,5 +55,3 @@ obj-$(CONFIG_IUCV) += iucv/ ifeq ($(CONFIG_NET),y) obj-$(CONFIG_SYSCTL) += sysctl_net.o endif - -obj-y += wireless/ |