---

yaml
---
r: 158813
b: refs/heads/master
c: c5ce901
h: refs/heads/master
i:
  158811: 61a7d91
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6f0b5c2993609c576a0c45e86f7e5b6dd0ae421
+refs/heads/master: c5ce901b3fdb2312f896f138ac864a7ef363c02d

trunk/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.

trunk/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