mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-09 22:14:36 -04:00
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>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
0629f3b8c3
commit
9680817362
@@ -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
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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!! */
|
||||
|
||||
Reference in New Issue
Block a user