From: Tony Cho Date: Mon, 12 Oct 2015 07:56:04 +0000 (+0900) Subject: staging: wilc1000: remove wilc_wlan.c included in wilc_wfi_cfgoperations.c X-Git-Tag: KARO-TX6UL-2015-11-03~34^2~976 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=60bd1003e1045732233493595367bf1d6d5df9f2;p=karo-tx-linux.git staging: wilc1000: remove wilc_wlan.c included in wilc_wfi_cfgoperations.c This patch removes "wilc_wlan.c" from the wilc_wfi_cfgoperation.c file and adds wilc_wlan.o into Makefile to compile it because there is few benefits. This patch also adds "wilc_wfi_netdevice.h" in the wilc_wlan.c file to avoid the compile errors. Signed-off-by: Tony Cho Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/wilc1000/Makefile b/drivers/staging/wilc1000/Makefile index f4950619c17f..64c2f1b83dfb 100644 --- a/drivers/staging/wilc1000/Makefile +++ b/drivers/staging/wilc1000/Makefile @@ -21,7 +21,8 @@ ccflags-$(CONFIG_WILC1000_DYNAMICALLY_ALLOCATE_MEMROY) += -DWILC_NORMAL_ALLOC wilc1000-objs := wilc_wfi_cfgoperations.o linux_wlan.o linux_mon.o \ wilc_msgqueue.o \ coreconfigurator.o host_interface.o \ - wilc_sdio.o wilc_spi.o wilc_wlan_cfg.o wilc_debugfs.o + wilc_sdio.o wilc_spi.o wilc_wlan_cfg.o wilc_debugfs.o \ + wilc_wlan.o wilc1000-$(CONFIG_WILC1000_SDIO) += linux_wlan_sdio.o wilc1000-$(CONFIG_WILC1000_SPI) += linux_wlan_spi.o diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index 11f9d465ece6..7abdd530c13a 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -11,7 +11,6 @@ */ #include "wilc_wfi_cfgoperations.h" -#include "wilc_wlan.c" #ifdef WILC_SDIO #include "linux_wlan_sdio.h" #endif diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c index e11d3d32d371..1d23badb5453 100644 --- a/drivers/staging/wilc1000/wilc_wlan.c +++ b/drivers/staging/wilc1000/wilc_wlan.c @@ -8,7 +8,7 @@ /* //////////////////////////////////////////////////////////////////////////// */ #include "wilc_wlan_if.h" -#include "wilc_wlan.h" +#include "wilc_wfi_netdevice.h" #include "wilc_wlan_cfg.h" /********************************************