From: Jes Sorensen <jes.soren...@redhat.com>

Reported-by: Jim Davis <jim.ep...@gmail.com>
Signed-off-by: Jes Sorensen <jes.soren...@redhat.com>
---
 drivers/staging/rtl8723au/Makefile               | 3 ++-
 drivers/staging/rtl8723au/core/rtw_cmd.c         | 1 +
 drivers/staging/rtl8723au/core/rtw_mlme_ext.c    | 3 ---
 drivers/staging/rtl8723au/core/rtw_pwrctrl.c     | 1 +
 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 950446e..f85f4b38 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 2f3fbb3..b9ee28a 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 9f9facd..9338cb9 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 7ae9748..96337a8 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 1aa65e0..2dc7c93 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!! */
-- 
1.9.0

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to