lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Browse Source
This commit is contained in:
John W. Linville
2011-03-11 14:11:11 -05:00
parent 1b7fe59322 8d5eab5aa6
commit 409ec36c32
78 changed files with 2592 additions and 1751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/wireless/rtlwifi/Makefile
View File

@@ -7,15 +7,18 @@ rtlwifi-objs := \
efuse.o \
ps.o \
rc.o \
regd.o \
usb.o
regd.o
rtl8192c_common-objs += \
ifeq ($(CONFIG_PCI),y)
ifneq ($(CONFIG_PCI),)
rtlwifi-objs += pci.o
endif
ifneq ($(CONFIG_USB),)
rtlwifi-objs += usb.o
endif
obj-$(CONFIG_RTL8192C_COMMON) += rtl8192c/
obj-$(CONFIG_RTL8192CE) += rtl8192ce/
obj-$(CONFIG_RTL8192CU) += rtl8192cu/