diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-16 02:54:45 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-16 02:54:45 +0300 |
| commit | 245f0db0de926601353776085e6f6a4c974c5615 (patch) | |
| tree | b493e9e726f4a898041f7861d0df328aa1a348a1 /drivers/nfc/Kconfig | |
| parent | 24672bdfb357b91bed0ea8d432241bf7bdefc8a8 (diff) | |
| parent | b562e44f507e863c6792946e4e1b1449fbbac85d (diff) | |
| download | linux-245f0db0de926601353776085e6f6a4c974c5615.tar.xz | |
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/Kconfig')
| -rw-r--r-- | drivers/nfc/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/nfc/Kconfig b/drivers/nfc/Kconfig index 0d6003dee3af..7437c9dfd8fc 100644 --- a/drivers/nfc/Kconfig +++ b/drivers/nfc/Kconfig @@ -76,4 +76,5 @@ source "drivers/nfc/st21nfca/Kconfig" source "drivers/nfc/st-nci/Kconfig" source "drivers/nfc/nxp-nci/Kconfig" source "drivers/nfc/s3fwrn5/Kconfig" +source "drivers/nfc/st95hf/Kconfig" endmenu |