diff options
| author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2014-05-21 09:37:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-23 16:27:40 +0900 |
| commit | 96808173627faebd1c39ab7af7630061bdd81c2a (patch) | |
| tree | 68119ea7c536d5cdca79c66943c8fb2d0f0fb296 | |
| parent | 0629f3b8c33899140b48d5897259eab8ebae78ca (diff) | |
| download | linux-96808173627faebd1c39ab7af7630061bdd81c2a.tar.gz linux-96808173627faebd1c39ab7af7630061bdd81c2a.tar.bz2 linux-96808173627faebd1c39ab7af7630061bdd81c2a.zip | |
staging: rtl8723au: Fix compiling with CONFIG_8723AU_BT_COEXIST=n
Reported-by: Jim Davis <jim.epost@gmail.com>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/rtl8723au/Makefile | 3 | ||||
| -rw-r--r-- | drivers/staging/rtl8723au/core/rtw_cmd.c | 1 | ||||
| -rw-r--r-- | drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 3 | ||||
| -rw-r--r-- | drivers/staging/rtl8723au/core/rtw_pwrctrl.c | 1 | ||||
| -rw-r--r-- | drivers/staging/rtl8723au/include/rtl8723a_hal.h | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/drivers/staging/rtl8723au/Makefile b/drivers/staging/rtl8723au/Makefile index 950446e4ee1b..f85f4b38bccf 100644 --- a/drivers/staging/rtl8723au/Makefile +++ b/drivers/staging/rtl8723au/Makefile @@ -24,7 +24,6 @@ r8723au-y := \ hal/HalHWImg8723A_RF.o \ hal/HalPwrSeqCmd.o \ hal/odm_RegConfig8723A.o \ - hal/rtl8723a_bt-coexist.o \ hal/odm_debug.o \ hal/odm_interface.o \ hal/odm_HWConfig.o \ @@ -50,6 +49,8 @@ r8723au-y := \ os_dep/usb_ops_linux.o \ os_dep/xmit_linux.o +r8723au-$(CONFIG_8723AU_BT_COEXIST) += hal/rtl8723a_bt-coexist.o + obj-$(CONFIG_R8723AU) := r8723au.o ccflags-y += -D__CHECK_ENDIAN__ -I$(src)/include diff --git a/drivers/staging/rtl8723au/core/rtw_cmd.c b/drivers/staging/rtl8723au/core/rtw_cmd.c index 2f3fbb3d1bbb..b9ee28a8730c 100644 --- a/drivers/staging/rtl8723au/core/rtw_cmd.c +++ b/drivers/staging/rtl8723au/core/rtw_cmd.c @@ -19,6 +19,7 @@ #include <recv_osdep.h> #include <mlme_osdep.h> #include <rtl8723a_cmd.h> +#include <rtw_sreset.h> #ifdef CONFIG_8723AU_BT_COEXIST #include <rtl8723a_hal.h> diff --git a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c index 9f9facd4a28a..9338cb94167c 100644 --- a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c @@ -22,10 +22,7 @@ #include <mlme_osdep.h> #include <recv_osdep.h> #include <linux/ieee80211.h> - -#ifdef CONFIG_8723AU_BT_COEXIST #include <rtl8723a_hal.h> -#endif static int OnAssocReq23a(struct rtw_adapter *padapter, struct recv_frame *precv_frame); static int OnAssocRsp23a(struct rtw_adapter *padapter, struct recv_frame *precv_frame); diff --git a/drivers/staging/rtl8723au/core/rtw_pwrctrl.c b/drivers/staging/rtl8723au/core/rtw_pwrctrl.c index 7ae9748dcd7b..96337a87b1d8 100644 --- a/drivers/staging/rtl8723au/core/rtw_pwrctrl.c +++ b/drivers/staging/rtl8723au/core/rtw_pwrctrl.c @@ -18,6 +18,7 @@ #include <drv_types.h> #include <osdep_intf.h> #include <rtl8723a_cmd.h> +#include <rtw_sreset.h> #ifdef CONFIG_8723AU_BT_COEXIST #include <rtl8723a_hal.h> diff --git a/drivers/staging/rtl8723au/include/rtl8723a_hal.h b/drivers/staging/rtl8723au/include/rtl8723a_hal.h index 1aa65e067209..2dc7c93df62e 100644 --- a/drivers/staging/rtl8723au/include/rtl8723a_hal.h +++ b/drivers/staging/rtl8723au/include/rtl8723a_hal.h @@ -29,8 +29,10 @@ #include "rtl8723a_cmd.h" #include "rtl8723a_sreset.h" #include "rtw_efuse.h" +#include "rtw_eeprom.h" #include "odm_precomp.h" +#include "odm.h" /* 2TODO: We should define 8192S firmware related macro settings here!! */ |