diff options
| author | David S. Miller | 2009-11-25 00:01:29 +0100 |
|---|---|---|
| committer | David S. Miller | 2009-11-25 00:01:29 +0100 |
| commit | 4ba3eb034fb6fd1990ccc5a6d71d5abcda37b905 (patch) | |
| tree | 0789ba36d96dba330416a1e6a9a68e891a78802a /net/mac80211/Makefile | |
| parent | net/ipv6: Move && and || to end of previous line (diff) | |
| parent | ath9k: set ps_default as false (diff) | |
| download | kernel-qcow2-linux-4ba3eb034fb6fd1990ccc5a6d71d5abcda37b905.tar.gz kernel-qcow2-linux-4ba3eb034fb6fd1990ccc5a6d71d5abcda37b905.tar.xz kernel-qcow2-linux-4ba3eb034fb6fd1990ccc5a6d71d5abcda37b905.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/Makefile')
| -rw-r--r-- | net/mac80211/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/Makefile b/net/mac80211/Makefile index 9f3cf7129324..298cfcc1bf8d 100644 --- a/net/mac80211/Makefile +++ b/net/mac80211/Makefile @@ -2,7 +2,7 @@ obj-$(CONFIG_MAC80211) += mac80211.o # mac80211 objects mac80211-y := \ - main.o \ + main.o status.o \ sta_info.o \ wep.o \ wpa.o \ |