aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/wilc1000/Makefile
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2018-09-18 09:33:27 -0700
committerDavid S. Miller <davem@davemloft.net>2018-09-18 09:33:27 -0700
commite366fa435032db1ce1538a2c029714666985dd48 (patch)
treed08bab02ba212339e4cfc0f2e3666435dd795b90 /drivers/staging/wilc1000/Makefile
parentnet: mdio: remove duplicated include from mdio_bus.c (diff)
parentMerge gitolite.kernel.org:/pub/scm/linux/kernel/git/davem/net (diff)
downloadlinux-dev-e366fa435032db1ce1538a2c029714666985dd48.tar.xz
linux-dev-e366fa435032db1ce1538a2c029714666985dd48.zip
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Two new tls tests added in parallel in both net and net-next. Used Stephen Rothwell's linux-next resolution. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/staging/wilc1000/Makefile')
-rw-r--r--drivers/staging/wilc1000/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/wilc1000/Makefile b/drivers/staging/wilc1000/Makefile
index f7b07c0b5ce2..ee7e26b886a5 100644
--- a/drivers/staging/wilc1000/Makefile
+++ b/drivers/staging/wilc1000/Makefile
@@ -1,4 +1,5 @@
# SPDX-License-Identifier: GPL-2.0
+obj-$(CONFIG_WILC1000) += wilc1000.o
ccflags-y += -DFIRMWARE_1002=\"atmel/wilc1002_firmware.bin\" \
-DFIRMWARE_1003=\"atmel/wilc1003_firmware.bin\"
@@ -11,9 +12,7 @@ wilc1000-objs := wilc_wfi_cfgoperations.o linux_wlan.o linux_mon.o \
wilc_wlan.o
obj-$(CONFIG_WILC1000_SDIO) += wilc1000-sdio.o
-wilc1000-sdio-objs += $(wilc1000-objs)
wilc1000-sdio-objs += wilc_sdio.o
obj-$(CONFIG_WILC1000_SPI) += wilc1000-spi.o
-wilc1000-spi-objs += $(wilc1000-objs)
wilc1000-spi-objs += wilc_spi.o