summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKalle Valo <kalle.valo@nokia.com>2009-06-12 14:17:06 +0300
committerJohn W. Linville <linville@tuxdriver.com>2009-07-10 14:57:48 -0400
commitc5ce901b3fdb2312f896f138ac864a7ef363c02d (patch)
tree031ecadaf6158edacc9a5379ee66f30d39b605d4
parente6f0b5c2993609c576a0c45e86f7e5b6dd0ae421 (diff)
downloadblackbird-op-linux-c5ce901b3fdb2312f896f138ac864a7ef363c02d.tar.gz
blackbird-op-linux-c5ce901b3fdb2312f896f138ac864a7ef363c02d.zip
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>
-rw-r--r--drivers/net/wireless/wl12xx/Kconfig17
-rw-r--r--drivers/net/wireless/wl12xx/Makefile4
2 files changed, 14 insertions, 7 deletions
diff --git a/drivers/net/wireless/wl12xx/Kconfig b/drivers/net/wireless/wl12xx/Kconfig
index a82c4cd436d8..82a0f97975de 100644
--- 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 bb2f2524a0bc..f94970c1d80d 100644
--- 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
OpenPOWER on IntegriCloud