diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-17 18:04:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-17 18:04:31 -0400 |
| commit | af4330631cd48987755f1a8d324dc318f60cf16b (patch) | |
| tree | 3c9233e81b450921326da13a7f8abacb58ab1f5e /drivers/net/wireless/Makefile | |
| parent | 2d6a5e9500103680464a723a4564961675652680 (diff) | |
| parent | 808ff697b357cee54e214efd27921a9ec6461a94 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/Makefile')
| -rw-r--r-- | drivers/net/wireless/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index e2574cafe051..d780487c420f 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile | |||
| @@ -48,6 +48,8 @@ obj-$(CONFIG_LIBERTAS_THINFIRM) += libertas_tf/ | |||
| 48 | 48 | ||
| 49 | obj-$(CONFIG_ADM8211) += adm8211.o | 49 | obj-$(CONFIG_ADM8211) += adm8211.o |
| 50 | 50 | ||
| 51 | obj-$(CONFIG_MWL8K) += mwl8k.o | ||
| 52 | |||
| 51 | obj-$(CONFIG_IWLWIFI) += iwlwifi/ | 53 | obj-$(CONFIG_IWLWIFI) += iwlwifi/ |
| 52 | obj-$(CONFIG_RT2X00) += rt2x00/ | 54 | obj-$(CONFIG_RT2X00) += rt2x00/ |
| 53 | 55 | ||