wcnss: Rename the module from wcnsswlan to wcnsscore
Rename the module produced for the wcnss subsystem to reflect the fact
that it provides core services, and not just services for WLAN
Signed-off-by: Jeff Johnson <jjohnson@codeaurora.org>
Conflicts:
drivers/net/wireless/Makefile
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 50dacf9..5c62769 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -283,15 +283,15 @@
---help---
A driver for Qualcomm WLAN SDIO Libra chipset.
-config WCNSS_WLAN
- tristate "Qualcomm WCNSS WLAN driver"
+config WCNSS_CORE
+ tristate "Qualcomm WCNSS CORE driver"
depends on ARCH_MSM8960
select WIRELESS_EXT
select WEXT_PRIV
select WEXT_CORE
select WEXT_SPY
---help---
- A driver for Qualcomm WCNSS WLAN feature
+ Core driver for the Qualcomm WCNSS triple play connectivity subsystem
source "drivers/net/wireless/ath/Kconfig"
source "drivers/net/wireless/b43/Kconfig"
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index f725adf..8c1ebb3 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -63,4 +63,4 @@
obj-$(CONFIG_BCMDHD) += bcmdhd/
obj-$(CONFIG_LIBRA_SDIOIF) += libra/
-obj-$(CONFIG_WCNSS_WLAN) += wcnss/
+obj-$(CONFIG_WCNSS_CORE) += wcnss/
diff --git a/drivers/net/wireless/wcnss/Makefile b/drivers/net/wireless/wcnss/Makefile
index d182b6e..c077848 100644
--- a/drivers/net/wireless/wcnss/Makefile
+++ b/drivers/net/wireless/wcnss/Makefile
@@ -1,6 +1,6 @@
-# Makefile for WCNSS WLAN driver
+# Makefile for WCNSS triple-play driver
-wcnsswlan-objs += wcnss_wlan.o wcnss_riva.o qcomwlan_secif.o
+wcnsscore-objs += wcnss_wlan.o wcnss_riva.o qcomwlan_secif.o
-obj-$(CONFIG_WCNSS_WLAN) += wcnsswlan.o
+obj-$(CONFIG_WCNSS_CORE) += wcnsscore.o