Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[sfrench/cifs-2.6.git] / drivers / net / caif / Kconfig

diff --git a/drivers/net/caif/Kconfig b/drivers/net/caif/Kconfig
index 0b28e0107697e58349d66695f6c5e24fbcc53497..631a6242b0112aec566b9df0916eb9b1d1552be5 100644 (file)
--- a/drivers/net/caif/Kconfig
+++ b/drivers/net/caif/Kconfig
@@ -2,16 +2,32 @@
 # CAIF physical drivers
 #
 
-if CAIF
-
 comment "CAIF transport drivers"
 
 config CAIF_TTY
        tristate "CAIF TTY transport driver"
+       depends on CAIF
        default n
        ---help---
        The CAIF TTY transport driver is a Line Discipline (ldisc)
        identified as N_CAIF. When this ldisc is opened from user space
        it will redirect the TTY's traffic into the CAIF stack.
 
-endif # CAIF
+config CAIF_SPI_SLAVE
+       tristate "CAIF SPI transport driver for slave interface"
+       depends on CAIF
+       default n
+       ---help---
+       The CAIF Link layer SPI Protocol driver for Slave SPI interface.
+       This driver implements a platform driver to accommodate for a
+       platform specific SPI device. A sample CAIF SPI Platform device is
+       provided in Documentation/networking/caif/spi_porting.txt
+
+config CAIF_SPI_SYNC
+       bool "Next command and length in start of frame"
+       depends on CAIF_SPI_SLAVE
+       default n
+       ---help---
+       Putting the next command and length in the start of the frame can
+       help to synchronize to the next transfer in case of over or under-runs.
+       This option also needs to be enabled on the modem.