Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[karo-tx-linux.git] / drivers / nfc / nfcmrvl / Kconfig

diff --git a/drivers/nfc/nfcmrvl/Kconfig b/drivers/nfc/nfcmrvl/Kconfig
index 796be241144069494966db68c996945da42b6d9d..444ca94697d96e213d69020f14e4535e0366f3e4 100644 (file)
--- a/drivers/nfc/nfcmrvl/Kconfig
+++ b/drivers/nfc/nfcmrvl/Kconfig
@@ -1,18 +1,15 @@
 config NFC_MRVL
-       tristate "Marvell NFC driver support"
-       depends on NFC_NCI
+       tristate
        help
          The core driver to support Marvell NFC devices.
 
          This driver is required if you want to support
          Marvell NFC device 8897.
 
-         Say Y here to compile Marvell NFC driver into the kernel or
-         say M to compile it as module.
-
 config NFC_MRVL_USB
        tristate "Marvell NFC-over-USB driver"
-       depends on NFC_MRVL && USB
+       depends on NFC_NCI && USB
+       select NFC_MRVL
        help
          Marvell NFC-over-USB driver.
 
@@ -24,7 +21,8 @@ config NFC_MRVL_USB
 
 config NFC_MRVL_UART
        tristate "Marvell NFC-over-UART driver"
-       depends on NFC_MRVL && NFC_NCI_UART
+       depends on NFC_NCI && NFC_NCI_UART
+       select NFC_MRVL
        help
          Marvell NFC-over-UART driver.
 
@@ -32,3 +30,25 @@ config NFC_MRVL_UART
 
          Say Y here to compile support for Marvell NFC-over-UART driver
          into the kernel or say M to compile it as module.
+
+config NFC_MRVL_I2C
+       tristate "Marvell NFC-over-I2C driver"
+       depends on NFC_MRVL && I2C
+       help
+         Marvell NFC-over-I2C driver.
+
+         This driver provides support for Marvell NFC-over-I2C devices.
+
+         Say Y here to compile support for Marvell NFC-over-I2C driver
+         into the kernel or say M to compile it as module.
+
+config NFC_MRVL_SPI
+       tristate "Marvell NFC-over-SPI driver"
+       depends on NFC_MRVL && SPI
+       help
+         Marvell NFC-over-SPI driver.
+
+         This driver provides support for Marvell NFC-over-SPI devices.
+
+         Say Y here to compile support for Marvell NFC-over-SPI driver
+         into the kernel or say M to compile it as module.