diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-11-28 10:56:03 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-28 10:56:03 -0500 |
| commit | 79d38f7d6cf545ff838dd5227869f3916d1d100d (patch) | |
| tree | 859c8071aab68fd32f36ffb9ebc04cf12db6e5e0 /drivers/net/wireless/rtlwifi/Makefile | |
| parent | 03f52a0a554210d5049eeed9f1bb29047dc807cb (diff) | |
| parent | 0751f8654602e4255f0b9c17784d8100d5896010 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/pcie/tx.c
Diffstat (limited to 'drivers/net/wireless/rtlwifi/Makefile')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/Makefile b/drivers/net/wireless/rtlwifi/Makefile index 97935c565ba..3b1cbac741e 100644 --- a/drivers/net/wireless/rtlwifi/Makefile +++ b/drivers/net/wireless/rtlwifi/Makefile | |||
| @@ -7,7 +7,8 @@ rtlwifi-objs := \ | |||
| 7 | efuse.o \ | 7 | efuse.o \ |
| 8 | ps.o \ | 8 | ps.o \ |
| 9 | rc.o \ | 9 | rc.o \ |
| 10 | regd.o | 10 | regd.o \ |
| 11 | stats.o | ||
| 11 | 12 | ||
| 12 | rtl8192c_common-objs += \ | 13 | rtl8192c_common-objs += \ |
| 13 | 14 | ||
| @@ -24,5 +25,6 @@ obj-$(CONFIG_RTL8192CE) += rtl8192ce/ | |||
| 24 | obj-$(CONFIG_RTL8192CU) += rtl8192cu/ | 25 | obj-$(CONFIG_RTL8192CU) += rtl8192cu/ |
| 25 | obj-$(CONFIG_RTL8192SE) += rtl8192se/ | 26 | obj-$(CONFIG_RTL8192SE) += rtl8192se/ |
| 26 | obj-$(CONFIG_RTL8192DE) += rtl8192de/ | 27 | obj-$(CONFIG_RTL8192DE) += rtl8192de/ |
| 28 | obj-$(CONFIG_RTL8723AE) += rtl8723ae/ | ||
| 27 | 29 | ||
| 28 | ccflags-y += -D__CHECK_ENDIAN__ | 30 | ccflags-y += -D__CHECK_ENDIAN__ |