Merge with /home/tmlind/src/kernel/linux-2.6

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

diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig
index cff8598aa8004e439564a9727d4495e1e3552012..8929c5e7e8404bc97021baf3c86f27478b72769d 100644 (file)
--- a/drivers/net/irda/Kconfig
+++ b/drivers/net/irda/Kconfig
@@ -348,9 +348,16 @@ config TOSHIBA_FIR
          To compile it as a module, choose M here: the module will be called
          donauboe.
 
+config OMAP_IR
+       tristate "OMAP IrDA(SIR/MIR/FIR)"
+       depends on IRDA && (ARCH_OMAP1 || ARCH_OMAP2)
+       select GPIOEXPANDER_OMAP if (MACH_OMAP_H3 || MACH_OMAP_H4)
+        help
+         Say Y here if you want to build support for the OMAP IR.
+
 config AU1000_FIR
        tristate "Alchemy Au1000 SIR/FIR"
-       depends on MIPS_AU1000 && IRDA
+       depends on SOC_AU1000 && IRDA
 
 config SMC_IRCC_FIR
        tristate "SMSC IrCC (EXPERIMENTAL)"
@@ -417,5 +424,20 @@ config PXA_FICP
          available capabilities may vary from one PXA2xx target to
          another.
 
+config MCS_FIR
+       tristate "MosChip MCS7780 IrDA-USB dongle"
+       depends on IRDA && USB && EXPERIMENTAL
+       help
+         Say Y or M here if you want to build support for the MosChip
+         MCS7780 IrDA-USB bridge device driver.
+
+         USB bridge based on the MosChip MCS7780 don't conform to the
+         IrDA-USB device class specification, and therefore need their
+         own specific driver. Those dongles support SIR and FIR (4Mbps)
+         speeds.
+
+         To compile it as a module, choose M here: the module will be called
+         mcs7780.
+
 endmenu