summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann2015-05-29 22:52:15 +0200
committerGreg Kroah-Hartman2015-05-31 01:56:57 +0200
commit691f1a2f035d345c5a908c5c1e2a158dde6c93fa (patch)
treef30e576512c701ed57612a946bf8bfab4291f434
parentstaging: wilc1000: remove thread wrapper (diff)
downloadkernel-qcow2-linux-691f1a2f035d345c5a908c5c1e2a158dde6c93fa.tar.gz
kernel-qcow2-linux-691f1a2f035d345c5a908c5c1e2a158dde6c93fa.tar.xz
kernel-qcow2-linux-691f1a2f035d345c5a908c5c1e2a158dde6c93fa.zip
staging: wilc1000: remove __DRIVER_VERSION__ macro
The driver version is meaningless, and in particular does not have to be passed from the Makefile. This removes the macros, but leaves the behavior of printing the 10.2 version untouched for the moment. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/wilc1000/Makefile6
-rw-r--r--drivers/staging/wilc1000/linux_wlan.c2
2 files changed, 1 insertions, 7 deletions
diff --git a/drivers/staging/wilc1000/Makefile b/drivers/staging/wilc1000/Makefile
index 4aa5f6764df4..13e3ed8ef31e 100644
--- a/drivers/staging/wilc1000/Makefile
+++ b/drivers/staging/wilc1000/Makefile
@@ -32,9 +32,3 @@ wilc1000-objs := wilc_wfi_netdevice.o wilc_wfi_cfgoperations.o linux_wlan.o linu
wilc1000-$(CONFIG_WILC1000_SDIO) += linux_wlan_sdio.o
wilc1000-$(CONFIG_WILC1000_SPI) += linux_wlan_spi.o
-
-WILC1000_SRC_VERSION = 10.0
-PATCHLEVEL = 2
-WILC1000_FW_VERSION = 0
-
-ccflags-y += -D__DRIVER_VERSION__=\"$(WILC1000_SRC_VERSION).$(PATCHLEVEL)\"
diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index 3f8b3c54f196..2a74441af09e 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -2747,7 +2747,7 @@ static int __init init_wilc_driver(void)
#endif
printk("IN INIT FUNCTION\n");
- printk("*** WILC1000 driver VERSION=[%s] FW_VER=[%s] ***\n", __DRIVER_VERSION__, __DRIVER_VERSION__);
+ printk("*** WILC1000 driver VERSION=[10.2] FW_VER=[10.2] ***\n");
linux_wlan_device_power(1);
msleep(100);