Merge branch 'linus' into core/futexes

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

diff --git a/drivers/uwb/Kconfig b/drivers/uwb/Kconfig
index a442f39f354c44c3edbca5eb50e73a6927b9bb04..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
@@ -57,4 +58,33 @@ config UWB_WHCI
           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_WLP
+       tristate "Support WiMedia Link Protocol (Ethernet/IP over UWB)"
+       depends on UWB && NET
+       help
+         This is a common library for drivers that implement
+         networking over UWB.
+
+config UWB_I1480U
+        tristate "Support for Intel Wireless UWB Link 1480 HWA"
+        depends on UWB_HWA
+        select FW_LOADER
+        help
+         This driver enables support for the i1480 when connected via
+         USB. It consists of a firmware uploader that will enable it
+         to behave as an HWA device.
+
+         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