Merge branches 'topic/slob/cleanups', 'topic/slob/fixes', 'topic/slub/core', 'topic...

[~andy/linux] / drivers / uwb / Kconfig

diff --git a/drivers/uwb/Kconfig b/drivers/uwb/Kconfig
index 59acb5b001d1953a089d45493a21570b07fee8d4..ca783127af3671cfb4dbe16d6c3405c864103c08 100644 (file)
--- a/drivers/uwb/Kconfig
+++ b/drivers/uwb/Kconfig
@@ -3,7 +3,8 @@
 #
 
 menuconfig UWB
-       tristate "Ultra Wide Band devices"
+       tristate "Ultra Wideband devices (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
        depends on PCI
        default n
        help
@@ -76,4 +77,14 @@ config UWB_I1480U
          To compile this driver select Y (built in) or M (module). It
          is safe to select any even if you do not have the hardware.
 
+config UWB_I1480U_WLP
+        tristate "Support for Intel Wireless UWB Link 1480 HWA's WLP interface"
+        depends on UWB_I1480U &&  UWB_WLP && NET
+        help
+         This driver enables WLP support for the i1480 when connected via
+         USB. WLP is the WiMedia Link Protocol, or IP over UWB.
+
+         To compile this driver select Y (built in) or M (module). It
+         is safe to select any even if you don't have the hardware.
+
 endif # UWB