diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2014-01-17 14:43:17 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-01-17 14:43:17 -0500 |
| commit | 7916a075571f0ccd0830cf3da293188a8b6045e3 (patch) | |
| tree | 119c5bb9e513c8205efed485c2dc7b8271123326 /drivers/nfc/Kconfig | |
| parent | Merge branch 'virtio_rx_merging' (diff) | |
| parent | carl9170: use ath_is_mybeacon (diff) | |
| download | linux-dev-7916a075571f0ccd0830cf3da293188a8b6045e3.tar.xz linux-dev-7916a075571f0ccd0830cf3da293188a8b6045e3.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
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 c1fb20603338..fe20e1cc0545 100644 --- a/drivers/nfc/Kconfig +++ b/drivers/nfc/Kconfig @@ -58,5 +58,6 @@ config NFC_PORT100 source "drivers/nfc/pn544/Kconfig" source "drivers/nfc/microread/Kconfig" +source "drivers/nfc/nfcmrvl/Kconfig" endmenu |