diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-26 14:32:28 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-26 14:32:28 -0400 |
| commit | 78fd9c4491a9c4cf8b401f1c5a516d3d28d3b42b (patch) | |
| tree | aa65a89a09cd28f7b305c4f27a47903996b5b365 /drivers/net/wireless/wl1251/Makefile | |
| parent | b9958a951ed4f8adff9ce02c2b1cb4ede8e2aa0e (diff) | |
| parent | 822395b591db32ad3cf8a5b57b0fe30fb8d12c37 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/wl1251/Makefile')
| -rw-r--r-- | drivers/net/wireless/wl1251/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/wireless/wl1251/Makefile b/drivers/net/wireless/wl1251/Makefile index 4fe246824db3..58b4f935a3f6 100644 --- a/drivers/net/wireless/wl1251/Makefile +++ b/drivers/net/wireless/wl1251/Makefile | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | wl1251-objs = main.o event.o tx.o rx.o ps.o cmd.o \ | 1 | wl1251-objs = main.o event.o tx.o rx.o ps.o cmd.o \ |
| 2 | acx.o boot.o init.o debugfs.o io.o | 2 | acx.o boot.o init.o debugfs.o io.o |
| 3 | wl1251_spi-objs += spi.o | ||
| 4 | wl1251_sdio-objs += sdio.o | ||
| 3 | 5 | ||
| 4 | obj-$(CONFIG_WL1251) += wl1251.o | 6 | obj-$(CONFIG_WL1251) += wl1251.o |
| 5 | obj-$(CONFIG_WL1251_SPI) += spi.o | 7 | obj-$(CONFIG_WL1251_SPI) += wl1251_spi.o |
| 6 | obj-$(CONFIG_WL1251_SDIO) += sdio.o | 8 | obj-$(CONFIG_WL1251_SDIO) += wl1251_sdio.o |