wl12xx: rename driver to wl1251

Rename driver to wl1251.ko in preparation for wl1271 driver.

Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
Reviewed-by: Vidhya Govindan <vidhya.govindan@nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/wl12xx/Kconfig b/drivers/net/wireless/wl12xx/Kconfig
index a82c4cd436d8626ddfb761e3777480c941881a16..82a0f97975de6e3f7ab196f7b87b68e9634d4f8f 100644 (file)
--- a/drivers/net/wireless/wl12xx/Kconfig
+++ b/drivers/net/wireless/wl12xx/Kconfig
@@ -1,11 +1,18 @@
-config WL12XX
-       tristate "TI wl1251/wl1271 support"
-       depends on MAC80211 && WLAN_80211 && SPI_MASTER && GENERIC_HARDIRQS && EXPERIMENTAL
+menuconfig WL12XX
+       boolean "TI wl12xx driver support"
+       depends on MAC80211 && WLAN_80211 && EXPERIMENTAL
+       ---help---
+         This will enable TI wl12xx driver support. The drivers make
+         use of the mac80211 stack.
+
+config WL1251
+       tristate "TI wl1251 support"
+       depends on WL12XX && SPI_MASTER && GENERIC_HARDIRQS
        select FW_LOADER
        select CRC7
        ---help---
          This module adds support for wireless adapters based on
-         TI wl1251/wl1271 chipsets.
+         TI wl1251 chipset.
 
-         If you choose to build a module, it'll be called wl12xx. Say N if
+         If you choose to build a module, it'll be called wl1251. Say N if
          unsure.

diff --git a/drivers/net/wireless/wl12xx/Makefile b/drivers/net/wireless/wl12xx/Makefile
index bb2f2524a0bcb4eb4f003fa9d339dff8e71030fe..f94970c1d80df97387b55697baaea42c4ecb0095 100644 (file)
--- a/drivers/net/wireless/wl12xx/Makefile
+++ b/drivers/net/wireless/wl12xx/Makefile
@@ -1,4 +1,4 @@
-wl12xx-objs            = main.o spi.o event.o wl1251_tx.o rx.o \
+wl1251-objs            = main.o spi.o event.o wl1251_tx.o rx.o \
                          ps.o cmd.o acx.o boot.o init.o wl1251_ops.o  \
                          debugfs.o
-obj-$(CONFIG_WL12XX)   += wl12xx.o
+obj-$(CONFIG_WL1251)   += wl1251.o