summaryrefslogtreecommitdiffstats
path: root/net/nfc/nfc.h
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-04-18 20:17:13 +0200
committerJohn W. Linville <linville@tuxdriver.com>2012-04-18 20:27:48 +0200
commit59ef43e681d103a51c3727dad0315e093f07ec61 (patch)
tree87f6320f1440ce3ce6c0c15ad3cef8bc98186f88 /net/nfc/nfc.h
parentMerge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge (diff)
parentmwifiex: corrections in timestamp related code (diff)
downloadlinux-59ef43e681d103a51c3727dad0315e093f07ec61.tar.xz
linux-59ef43e681d103a51c3727dad0315e093f07ec61.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts: drivers/net/wireless/iwlwifi/iwl-testmode.c include/net/nfc/nfc.h net/nfc/netlink.c net/wireless/nl80211.c
Diffstat (limited to 'net/nfc/nfc.h')
-rw-r--r--net/nfc/nfc.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/nfc/nfc.h b/net/nfc/nfc.h
index 061a830b0a88..7d589a81942e 100644
--- a/net/nfc/nfc.h
+++ b/net/nfc/nfc.h
@@ -119,6 +119,7 @@ void nfc_genl_data_init(struct nfc_genl_data *genl_data);
void nfc_genl_data_exit(struct nfc_genl_data *genl_data);
int nfc_genl_targets_found(struct nfc_dev *dev);
+int nfc_genl_target_lost(struct nfc_dev *dev, u32 target_idx);
int nfc_genl_device_added(struct nfc_dev *dev);
int nfc_genl_device_removed(struct nfc_dev *dev);