7 files changed, 57 insertions, 0 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 70dba1668907..8eedbfa52f00 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1220,6 +1220,8 @@ source "drivers/hid/Kconfig"
 
 source "drivers/usb/Kconfig"
 
+source "drivers/uwb/Kconfig"
+
 source "drivers/mmc/Kconfig"
 
 source "drivers/leds/Kconfig"
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 9389d38f222f..cb66c4da25ca 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -677,6 +677,8 @@ source "fs/Kconfig"
 
 source "drivers/usb/Kconfig"
 
+source "drivers/uwb/Kconfig"
+
 source "arch/cris/Kconfig.debug"
 
 source "security/Kconfig"
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index 396ab059efa3..2b413325e885 100644
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -213,6 +213,8 @@ source "drivers/hwmon/Kconfig"
 
 source "drivers/usb/Kconfig"
 
+source "drivers/uwb/Kconfig"
+
 endmenu
 
 source "fs/Kconfig"
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 59f33fa6af3e..9b399a1bae8b 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -78,6 +78,8 @@ source "drivers/hid/Kconfig"
 
 source "drivers/usb/Kconfig"
 
+source "drivers/uwb/Kconfig"
+
 source "drivers/mmc/Kconfig"
 
 source "drivers/memstick/Kconfig"
diff --git a/drivers/Makefile b/drivers/Makefile
index 2735bde73475..1a6930f9726a 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -99,3 +99,4 @@ obj-$(CONFIG_OF)		+= of/
 obj-$(CONFIG_SSB)               += ssb/
 obj-$(CONFIG_VIRTIO)            += virtio/
 obj-$(CONFIG_REGULATOR)         += regulator/
+obj-$(CONFIG_UWB)               += uwb/
diff --git a/drivers/uwb/Kconfig b/drivers/uwb/Kconfig
new file mode 100644
index 000000000000..3f01a69daf8b
--- /dev/null
+++ b/drivers/uwb/Kconfig
@@ -0,0 +1,28 @@
+#
+# UWB device configuration
+#
+
+menuconfig UWB
+        tristate "Ultra Wide Band devices"
+        depends on PCI
+        default n
+        help
+          UWB is a high-bandwidth, low-power, point-to-point radio
+          technology using a wide spectrum (3.1-10.6GHz). It is
+          optimized for in-room use (480Mbps at 2 meters, 110Mbps at
+          10m). It serves as the transport layer for other protocols,
+          such as Wireless USB (WUSB), IP (WLP) and upcoming
+          Bluetooth and 1394
+
+          The topology is peer to peer; however, higher level
+          protocols (such as WUSB) might impose a master/slave
+          relationship.
+
+          Say Y here if your computer has UWB radio controllers (USB or PCI)
+          based. You will need to enable the radio controllers
+          below.  It is ok to select all of them, no harm done.
+
+          For more help check the UWB and WUSB related files in
+          <file:Documentation/usb/>.
+
+          To compile the UWB stack as a module, choose M here.
diff --git a/drivers/uwb/Makefile b/drivers/uwb/Makefile
new file mode 100644
index 000000000000..9a67be5ac5c1
--- /dev/null
+++ b/drivers/uwb/Makefile
@@ -0,0 +1,20 @@
+obj-$(CONFIG_UWB)               += uwb.o
+
+uwb-objs :=             \
+        address.o       \
+        beacon.o        \
+        driver.o        \
+        drp.o           \
+        drp-avail.o     \
+        drp-ie.o        \
+        est.o           \
+        ie.o            \
+        lc-dev.o        \
+        lc-rc.o         \
+        neh.o           \
+        pal.o           \
+        reset.o         \
+        rsv.o           \
+        scan.o          \
+        uwb-debug.o     \
+        uwbd.o