linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig
index a464841..7a08134 100644 (file)
--- a/drivers/net/irda/Kconfig
+++ b/drivers/net/irda/Kconfig
@@ -1,4 +1,3 @@
-
 menu "Infrared-port device drivers"
        depends on IRDA!=n
 
@@ -156,7 +155,7 @@ comment "Old Serial dongle support"
 
 config DONGLE_OLD
        bool "Old Serial dongle support"
-       depends on (IRTTY_OLD || IRPORT_SIR) && BROKEN_ON_SMP
+       depends on IRPORT_SIR && BROKEN_ON_SMP
        help
          Say Y here if you have an infrared device that connects to your
          computer's serial port. These devices are called dongles. Then say Y
@@ -310,7 +309,7 @@ config SIGMATEL_FIR
 
 config NSC_FIR
        tristate "NSC PC87108/PC87338"
-       depends on IRDA && ISA
+       depends on IRDA && ISA_DMA_API
        help
          Say Y here if you want to build support for the NSC PC87108 and
          PC87338 IrDA chipsets.  This driver supports SIR,
@@ -321,7 +320,7 @@ config NSC_FIR
 
 config WINBOND_FIR
        tristate "Winbond W83977AF (IR)"
-       depends on IRDA && ISA
+       depends on IRDA && ISA_DMA_API
        help
          Say Y here if you want to build IrDA support for the Winbond
          W83977AF super-io chipset.  This driver should be used for the IrDA
@@ -347,7 +346,7 @@ config AU1000_FIR
 
 config SMC_IRCC_FIR
        tristate "SMSC IrCC (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && IRDA && ISA
+       depends on EXPERIMENTAL && IRDA && ISA_DMA_API
        help
          Say Y here if you want to build support for the SMC Infrared
          Communications Controller.  It is used in a wide variety of
@@ -357,7 +356,7 @@ config SMC_IRCC_FIR
 
 config ALI_FIR
        tristate "ALi M5123 FIR (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && IRDA && ISA
+       depends on EXPERIMENTAL && IRDA && ISA_DMA_API
        help
          Say Y here if you want to build support for the ALi M5123 FIR
          Controller.  The ALi M5123 FIR Controller is embedded in ALi M1543C,
@@ -385,11 +384,11 @@ config SA1100_FIR
 
 config VIA_FIR
        tristate "VIA VT8231/VT1211 SIR/MIR/FIR"
-       depends on IRDA && ISA && PCI
+       depends on IRDA && ISA_DMA_API
        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 +399,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