Commit 96808173 authored May 21, 2014 by Jes Sorensen Committed by Greg Kroah-Hartman May 23, 2014

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>

parent 0629f3b8

drivers/staging/rtl8723au/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -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

drivers/staging/rtl8723au/core/rtw_cmd.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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>

drivers/staging/rtl8723au/core/rtw_mlme_ext.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -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);

drivers/staging/rtl8723au/core/rtw_pwrctrl.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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>

drivers/staging/rtl8723au/include/rtl8723a_hal.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -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!! */