summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorRandy Dunlap2011-09-21 20:02:37 +0200
committerJohn W. Linville2011-09-21 22:19:44 +0200
commited46fdfc54d2d4523fdd727708fe0b9e2be993cc (patch)
tree89fb3856cfefb90a846c8a3de41e67953381aeac /drivers/nfc
parentmwifiex: remove unneeded NULL check (diff)
downloadkernel-qcow2-linux-ed46fdfc54d2d4523fdd727708fe0b9e2be993cc.tar.gz
kernel-qcow2-linux-ed46fdfc54d2d4523fdd727708fe0b9e2be993cc.tar.xz
kernel-qcow2-linux-ed46fdfc54d2d4523fdd727708fe0b9e2be993cc.zip
nfc: NFC_WILINK depends on NFC_NCI
nwcwilink.c uses nci_*() interfaces, so it should depend on NFC_NCI. Fixes these build errors: ERROR: "nci_register_device" [drivers/nfc/nfcwilink.ko] undefined! ERROR: "nci_allocate_device" [drivers/nfc/nfcwilink.ko] undefined! ERROR: "nci_recv_frame" [drivers/nfc/nfcwilink.ko] undefined! ERROR: "nci_free_device" [drivers/nfc/nfcwilink.ko] undefined! ERROR: "nci_unregister_device" [drivers/nfc/nfcwilink.ko] undefined! Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/nfc')
-rw-r--r--drivers/nfc/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nfc/Kconfig b/drivers/nfc/Kconfig
index 8a56fd3da989..5af959274d4e 100644
--- a/drivers/nfc/Kconfig
+++ b/drivers/nfc/Kconfig
@@ -29,7 +29,7 @@ config NFC_PN533
config NFC_WILINK
tristate "Texas Instruments NFC WiLink driver"
- depends on TI_ST
+ depends on TI_ST && NFC_NCI
help
This enables the NFC driver for Texas Instrument's BT/FM/GPS/NFC
combo devices. This makes use of shared transport line discipline