diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-08 13:37:51 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-08 13:37:51 +1000 |
| commit | 02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch) | |
| tree | 04ef573cd4de095c500c9fc3477f4278c0b36300 /net/Makefile | |
| parent | 7487a2245b8841c77ba9db406cf99a483b9334e9 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'net/Makefile')
| -rw-r--r-- | net/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/Makefile b/net/Makefile index 6b74d4118c5..34e5b2d7f87 100644 --- a/net/Makefile +++ b/net/Makefile @@ -45,13 +45,14 @@ 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/ obj-$(CONFIG_IUCV) += iucv/ +obj-$(CONFIG_RFKILL) += rfkill/ ifeq ($(CONFIG_NET),y) obj-$(CONFIG_SYSCTL) += sysctl_net.o endif - -obj-y += wireless/ |