Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.

1 files changed, 13 insertions, 0 deletions

diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig
index fd59f6bdd67f..298e4a25e3d3 100644
--- a/drivers/usb/input/Kconfig
+++ b/drivers/usb/input/Kconfig
@@ -259,3 +259,16 @@ config USB_ATI_REMOTE
           To compile this driver as a module, choose M here: the module will be
           called ati_remote.
 
+config USB_KEYSPAN_REMOTE
+        tristate "Keyspan DMR USB remote control (EXPERIMENTAL)"
+        depends on USB && INPUT && EXPERIMENTAL
+        ---help---
+          Say Y here if you want to use a Keyspan DMR USB remote control.
+          Currently only the UIA-11 type of receiver has been tested.  The tag
+          on the receiver that connects to the USB port should have a P/N that
+          will tell you what type of DMR you have.  The UIA-10 type is not
+          supported at this time.  This driver maps all buttons to keypress
+          events.
+
+          To compile this driver as a module, choose M here: the module will
+          be called keyspan_remote.