Merge branch 'master' of /home/tglx/work/mtd/git/linux-2.6.git/

[linux-2.6] / drivers / net / irda / Kconfig

diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig
index 1c553d7efdd9f42b2874f37b08428d96cb4be8a8..d54156f11e61a3cb043bc20f25fa48fde0fc217f 100644 (file)
--- a/drivers/net/irda/Kconfig
+++ b/drivers/net/irda/Kconfig
@@ -389,7 +389,7 @@ config VIA_FIR
        help
          Say Y here if you want to build support for the VIA VT8231
          and VIA VT1211 IrDA controllers, found on the motherboards using
-         those those VIA chipsets. To use this controller, you will need
+         those VIA chipsets. To use this controller, you will need
          to plug a specific 5 pins FIR IrDA dongle in the specific
          motherboard connector. The driver provides support for SIR, MIR
          and FIR (4Mbps) speeds.
@@ -400,5 +400,15 @@ config VIA_FIR
          To compile it as a module, choose M here: the module will be called
          via-ircc.
 
+config PXA_FICP
+       tristate "Intel PXA2xx Internal FICP"
+       depends on ARCH_PXA && IRDA
+       help
+         Say Y or M here if you want to build support for the PXA2xx
+         built-in IRDA interface which can support both SIR and FIR.
+         This driver relies on platform specific helper routines so
+         available capabilities may vary from one PXA2xx target to
+         another.
+
 endmenu