Merge branch 'master' into next

[linux-2.6-omap-h63xx.git] / drivers / staging / winbond / Kconfig

diff --git a/drivers/staging/winbond/Kconfig b/drivers/staging/winbond/Kconfig
index 425219ed7ab9c4cedf30a721734c9aaeee6755c7..940460c39f36683c2d5f93ce65ddb7aa828eae68 100644 (file)
--- a/drivers/staging/winbond/Kconfig
+++ b/drivers/staging/winbond/Kconfig
@@ -1,7 +1,11 @@
 config W35UND
-       tristate "Winbond driver"
-       depends on MAC80211 && WLAN_80211 && USB && EXPERIMENTAL && !4KSTACKS
+       tristate "IS89C35 WLAN USB driver"
+       depends on MAC80211 && WLAN_80211 && USB && EXPERIMENTAL
        default n
        ---help---
-         This is highly experimental driver for winbond wifi card on some Kohjinsha notebooks
-         Check http://code.google.com/p/winbondport/ for new version
+         This is highly experimental driver for Winbond WIFI card.
+
+         Hardware is present in some Kohjinsha subnotebooks, and in some
+         stand-alone USB modules. Chipset name seems to be w89c35d.
+
+         Check http://code.google.com/p/winbondport/ for new version.