Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig
index 71d2627796bda98f45f89166d4227b7a9223c7de..bfa6cc9ed9738ac8749df4d1d60b78c8b4de51be 100644 (file)
--- a/drivers/net/irda/Kconfig
+++ b/drivers/net/irda/Kconfig
@@ -162,7 +162,33 @@ config EP7211_DONGLE
          Say Y here if you want to build support for the Cirrus logic
          EP7211 chipset's infrared module.
 
+config KSDAZZLE_DONGLE
+       tristate "KingSun Dazzle IrDA-USB dongle (EXPERIMENTAL)"
+       depends on IRDA && USB && EXPERIMENTAL
+       help
+         Say Y or M here if you want to build support for the KingSun Dazzle
+         IrDA-USB bridge device driver.
+
+         This USB bridge does not conform to the IrDA-USB device class
+         specification, and therefore needs its own specific driver. This
+         dongle supports SIR speeds only (9600 through 115200 bps).
+
+         To compile it as a module, choose M here: the module will be called
+         ksdazzle-sir.
 
+config KS959_DONGLE
+       tristate "KingSun KS-959 IrDA-USB dongle (EXPERIMENTAL)"
+       depends on IRDA && USB && EXPERIMENTAL
+       help
+         Say Y or M here if you want to build support for the KingSun KS-959
+         IrDA-USB bridge device driver.
+
+         This USB bridge does not conform to the IrDA-USB device class
+         specification, and therefore needs its own specific driver. This
+         dongle supports SIR speeds only (9600 through 57600 bps).
+
+         To compile it as a module, choose M here: the module will be called
+         ks959-sir.
 
 comment "Old SIR device drivers"