summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ti/Makefile
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-06-12 20:25:04 +0200
committerJohn W. Linville <linville@tuxdriver.com>2012-06-12 20:25:04 +0200
commit0440507bbc44149e63bbfb9df730ba3820371904 (patch)
tree7275e41aa1aa7e4d19d0503f1c15f07991c1a120 /drivers/net/wireless/ti/Makefile
parentphy: Use pr_<level> (diff)
parentssb: add missing PCI ID for b/g/n single band BCM4322 (diff)
downloadlinux-0440507bbc44149e63bbfb9df730ba3820371904.tar.xz
linux-0440507bbc44149e63bbfb9df730ba3820371904.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/ti/Makefile')
-rw-r--r--drivers/net/wireless/ti/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ti/Makefile b/drivers/net/wireless/ti/Makefile
index 0a565622d4a4..4d6823983c04 100644
--- a/drivers/net/wireless/ti/Makefile
+++ b/drivers/net/wireless/ti/Makefile
@@ -2,3 +2,4 @@ obj-$(CONFIG_WLCORE) += wlcore/
obj-$(CONFIG_WL12XX) += wl12xx/
obj-$(CONFIG_WL12XX_PLATFORM_DATA) += wlcore/
obj-$(CONFIG_WL1251) += wl1251/
+obj-$(CONFIG_WL18XX) += wl18xx/