diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-02 03:48:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-02 03:48:33 -0400 |
| commit | 5d8c397f304e1363f8ff9749b08172eb59e6534a (patch) | |
| tree | 57ff502553918aa7309b7375e983f27f719e7b28 /net/Makefile | |
| parent | 44757223cd77f6e332dfa0b043c67df7b665bc19 (diff) | |
| parent | ceeec3dc375e3b0618f16b34efc56fe093918f8b (diff) | |
Merge refs/heads/ieee80211-wifi from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'net/Makefile')
| -rw-r--r-- | net/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/Makefile b/net/Makefile index 7e6eff206c81..4aa2f46d2a56 100644 --- a/net/Makefile +++ b/net/Makefile | |||
| @@ -44,6 +44,7 @@ obj-$(CONFIG_ECONET) += econet/ | |||
| 44 | obj-$(CONFIG_VLAN_8021Q) += 8021q/ | 44 | obj-$(CONFIG_VLAN_8021Q) += 8021q/ |
| 45 | obj-$(CONFIG_IP_DCCP) += dccp/ | 45 | obj-$(CONFIG_IP_DCCP) += dccp/ |
| 46 | obj-$(CONFIG_IP_SCTP) += sctp/ | 46 | obj-$(CONFIG_IP_SCTP) += sctp/ |
| 47 | obj-$(CONFIG_IEEE80211) += ieee80211/ | ||
| 47 | 48 | ||
| 48 | ifeq ($(CONFIG_NET),y) | 49 | ifeq ($(CONFIG_NET),y) |
| 49 | obj-$(CONFIG_SYSCTL) += sysctl_net.o | 50 | obj-$(CONFIG_SYSCTL) += sysctl_net.o |