From: Jes Sorensen <Jes.Sorensen@xxxxxxxxxx> As an added bonus, remove the now obsolete rtw_ioctl_set.h Signed-off-by: Jes Sorensen <Jes.Sorensen@xxxxxxxxxx> --- drivers/staging/rtl8723au/core/rtw_mlme.c | 1 - .../staging/rtl8723au/hal/rtl8723a_bt-coexist.c | 1 - drivers/staging/rtl8723au/hal/rtl8723a_cmd.c | 1 - drivers/staging/rtl8723au/include/rtl8723a_cmd.h | 2 ++ drivers/staging/rtl8723au/include/rtw_ioctl_set.h | 22 ---------------------- drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 1 - drivers/staging/rtl8723au/os_dep/mlme_linux.c | 1 - 7 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 drivers/staging/rtl8723au/include/rtw_ioctl_set.h diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c index e89d019..ab95ef0 100644 --- a/drivers/staging/rtl8723au/core/rtw_mlme.c +++ b/drivers/staging/rtl8723au/core/rtw_mlme.c @@ -24,7 +24,6 @@ #include <linux/ieee80211.h> #include <wifi.h> #include <wlan_bssdef.h> -#include <rtw_ioctl_set.h> #include <rtw_sreset.h> static struct wlan_network * diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c b/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c index bb86986..9054a98 100644 --- a/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c +++ b/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c @@ -14,7 +14,6 @@ ******************************************************************************/ #include <drv_types.h> #include <rtl8723a_hal.h> -#include <rtw_ioctl_set.h> #include <usb_ops_linux.h> #define DIS_PS_RX_BCN diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_cmd.c b/drivers/staging/rtl8723au/hal/rtl8723a_cmd.c index e873791..6e1fed2 100644 --- a/drivers/staging/rtl8723au/hal/rtl8723a_cmd.c +++ b/drivers/staging/rtl8723au/hal/rtl8723a_cmd.c @@ -18,7 +18,6 @@ #include <drv_types.h> #include <recv_osdep.h> #include <mlme_osdep.h> -#include <rtw_ioctl_set.h> #include <rtl8723a_hal.h> #include <usb_ops_linux.h> diff --git a/drivers/staging/rtl8723au/include/rtl8723a_cmd.h b/drivers/staging/rtl8723au/include/rtl8723a_cmd.h index 900bacc..e1ecbd0 100644 --- a/drivers/staging/rtl8723au/include/rtl8723a_cmd.h +++ b/drivers/staging/rtl8723au/include/rtl8723a_cmd.h @@ -155,4 +155,6 @@ void rtl8723a_add_rateatid(struct rtw_adapter *padapter, u32 bitmap, u8 arg, u8 void CheckFwRsvdPageContent23a(struct rtw_adapter *padapter); +int FillH2CCmd(struct rtw_adapter *padapter, u8 ElementID, u32 CmdLen, u8 *pCmdBuffer); + #endif diff --git a/drivers/staging/rtl8723au/include/rtw_ioctl_set.h b/drivers/staging/rtl8723au/include/rtw_ioctl_set.h deleted file mode 100644 index 6c102dc..0000000 --- a/drivers/staging/rtl8723au/include/rtw_ioctl_set.h +++ /dev/null @@ -1,22 +0,0 @@ -/****************************************************************************** - * - * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - ******************************************************************************/ -#ifndef __RTW_IOCTL_SET_H_ -#define __RTW_IOCTL_SET_H_ - -#include <drv_types.h> - -s32 FillH2CCmd(struct rtw_adapter *padapter, u8 ElementID, u32 CmdLen, u8 *pCmdBuffer); - -#endif diff --git a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c index 7674087..1d7c822 100644 --- a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c @@ -16,7 +16,6 @@ #include <osdep_service.h> #include <drv_types.h> -#include <rtw_ioctl_set.h> #include <xmit_osdep.h> #include "ioctl_cfg80211.h" diff --git a/drivers/staging/rtl8723au/os_dep/mlme_linux.c b/drivers/staging/rtl8723au/os_dep/mlme_linux.c index ac618fb..ca24369 100644 --- a/drivers/staging/rtl8723au/os_dep/mlme_linux.c +++ b/drivers/staging/rtl8723au/os_dep/mlme_linux.c @@ -18,7 +18,6 @@ #include <osdep_service.h> #include <drv_types.h> #include <mlme_osdep.h> -#include <rtw_ioctl_set.h> static struct rt_pmkid_list backupPMKIDList[NUM_PMKID_CACHE]; -- 1.9.3 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
