diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-16 00:54:45 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-16 00:54:45 +0100 |
| commit | 245f0db0de926601353776085e6f6a4c974c5615 (patch) | |
| tree | b493e9e726f4a898041f7861d0df328aa1a348a1 /drivers/nfc/st-nci/Kconfig | |
| parent | Input: synaptics-rmi4 - using logical instead of bitwise AND (diff) | |
| parent | Linux 4.5 (diff) | |
| download | linux-245f0db0de926601353776085e6f6a4c974c5615.tar.xz linux-245f0db0de926601353776085e6f6a4c974c5615.zip | |
Merge tag 'v4.5' into next
Merge with Linux 4.5 to get PROPERTY_ENTRY_INTEGER() that is needed to
fix pxa/raumfeld rotary encoder properties.
Diffstat (limited to 'drivers/nfc/st-nci/Kconfig')
| -rw-r--r-- | drivers/nfc/st-nci/Kconfig | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/drivers/nfc/st-nci/Kconfig b/drivers/nfc/st-nci/Kconfig index e7c6db9c5860..dc9b777d78f6 100644 --- a/drivers/nfc/st-nci/Kconfig +++ b/drivers/nfc/st-nci/Kconfig @@ -1,19 +1,14 @@ config NFC_ST_NCI - tristate "STMicroelectronics ST NCI NFC driver" - depends on NFC_NCI - default n + tristate ---help--- STMicroelectronics NFC NCI chips core driver. It implements the chipset NCI logic and hooks into the NFC kernel APIs. Physical layers will register against it. - To compile this driver as a module, choose m here. The module will - be called st-nci. - Say N if unsure. - config NFC_ST_NCI_I2C - tristate "NFC ST NCI i2c support" - depends on NFC_ST_NCI && I2C + tristate "STMicroelectronics ST NCI NFC driver (I2C)" + depends on NFC_NCI && I2C + select NFC_ST_NCI ---help--- This module adds support for an I2C interface to the STMicroelectronics NFC NCI chips familly. @@ -23,8 +18,9 @@ config NFC_ST_NCI_I2C Say N if unsure. config NFC_ST_NCI_SPI - tristate "NFC ST NCI spi support" - depends on NFC_ST_NCI && SPI + tristate "STMicroelectronics ST NCI NFC driver (SPI)" + depends on NFC_NCI && SPI + select NFC_ST_NCI ---help--- This module adds support for an SPI interface to the STMicroelectronics NFC NCI chips familly. |