diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
| commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
| tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/rtl8712/Makefile | |
| parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
| parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
| download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz | |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8712/Makefile')
| -rw-r--r-- | drivers/staging/rtl8712/Makefile | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/drivers/staging/rtl8712/Makefile b/drivers/staging/rtl8712/Makefile new file mode 100644 index 0000000..6f8500c --- /dev/null +++ b/drivers/staging/rtl8712/Makefile @@ -0,0 +1,34 @@ +r8712u-y := \ + rtl871x_cmd.o \ + rtl8712_cmd.o \ + rtl871x_security.o \ + rtl871x_eeprom.o \ + rtl8712_efuse.o \ + hal_init.o \ + usb_halinit.o \ + usb_ops.o \ + usb_ops_linux.o \ + rtl871x_io.o \ + rtl8712_io.o \ + rtl871x_ioctl_linux.o \ + rtl871x_ioctl_rtl.o \ + rtl871x_ioctl_set.o \ + rtl8712_led.o \ + rtl871x_mlme.o \ + ieee80211.o \ + rtl871x_mp_ioctl.o \ + rtl871x_mp.o \ + mlme_linux.o \ + recv_linux.o \ + xmit_linux.o \ + usb_intf.o \ + os_intfs.o \ + rtl871x_pwrctrl.o \ + rtl8712_recv.o \ + rtl871x_recv.o \ + rtl871x_sta_mgt.o \ + rtl871x_xmit.o \ + rtl8712_xmit.o + +obj-$(CONFIG_R8712U) := r8712u.o + |
