This file contains only the definition of the driver version. This statement is moved into a header called by all the affected source files, and the now empty header is deleted. Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx> --- drivers/staging/r8188eu/core/rtw_debug.c | 2 +- drivers/staging/r8188eu/include/drv_types.h | 2 ++ drivers/staging/r8188eu/include/rtw_version.h | 2 -- drivers/staging/r8188eu/os_dep/ioctl_linux.c | 1 - drivers/staging/r8188eu/os_dep/os_intfs.c | 1 - drivers/staging/r8188eu/os_dep/usb_intf.c | 1 - 6 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 drivers/staging/r8188eu/include/rtw_version.h diff --git a/drivers/staging/r8188eu/core/rtw_debug.c b/drivers/staging/r8188eu/core/rtw_debug.c index 522fd59c2d50..a0ca61d8c3b8 100644 --- a/drivers/staging/r8188eu/core/rtw_debug.c +++ b/drivers/staging/r8188eu/core/rtw_debug.c @@ -4,7 +4,7 @@ #define _RTW_DEBUG_C_ #include <rtw_debug.h> -#include <rtw_version.h> +#include <drv_types.h> int proc_get_drv_version(char *page, char **start, off_t offset, int count, diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/r8188eu/include/drv_types.h index 0acc5847a602..d407d9274a78 100644 --- a/drivers/staging/r8188eu/include/drv_types.h +++ b/drivers/staging/r8188eu/include/drv_types.h @@ -38,6 +38,8 @@ #include <rtw_mp.h> #include <rtw_br_ext.h> +#define DRIVERVERSION "v4.1.4_6773.20130222" + enum _NIC_VERSION { RTL8711_NIC, RTL8712_NIC, diff --git a/drivers/staging/r8188eu/include/rtw_version.h b/drivers/staging/r8188eu/include/rtw_version.h deleted file mode 100644 index 4ca74a9465fe..000000000000 --- a/drivers/staging/r8188eu/include/rtw_version.h +++ /dev/null @@ -1,2 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ -#define DRIVERVERSION "v4.1.4_6773.20130222" diff --git a/drivers/staging/r8188eu/os_dep/ioctl_linux.c b/drivers/staging/r8188eu/os_dep/ioctl_linux.c index 37973930845d..109389549435 100644 --- a/drivers/staging/r8188eu/os_dep/ioctl_linux.c +++ b/drivers/staging/r8188eu/os_dep/ioctl_linux.c @@ -14,7 +14,6 @@ #include <rtw_ioctl_set.h> #include <rtw_mp_ioctl.h> #include <usb_ops.h> -#include <rtw_version.h> #include <rtl8188e_hal.h> #include <rtw_mp.h> diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8188eu/os_dep/os_intfs.c index 34af5237d9e6..cf92dc2a4fcc 100644 --- a/drivers/staging/r8188eu/os_dep/os_intfs.c +++ b/drivers/staging/r8188eu/os_dep/os_intfs.c @@ -9,7 +9,6 @@ #include <recv_osdep.h> #include <hal_intf.h> #include <rtw_ioctl.h> -#include <rtw_version.h> #include <usb_osintf.h> #include <rtw_br_ext.h> diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8188eu/os_dep/usb_intf.c index 905a08ebd80d..7db33946e418 100644 --- a/drivers/staging/r8188eu/os_dep/usb_intf.c +++ b/drivers/staging/r8188eu/os_dep/usb_intf.c @@ -8,7 +8,6 @@ #include <recv_osdep.h> #include <xmit_osdep.h> #include <hal_intf.h> -#include <rtw_version.h> #include <linux/usb.h> #include <osdep_intf.h> -- 2.32.0