Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...

[~andy/linux] / net / nfc / nfc.h

diff --git a/net/nfc/nfc.h b/net/nfc/nfc.h
index 820a7850c36ac7e49012869a88472a96358e2220..aaf606fc1faa5d2d9a46a691fed2fa3840ea094a 100644 (file)
--- a/net/nfc/nfc.h
+++ b/net/nfc/nfc.h
@@ -124,9 +124,8 @@ static inline void nfc_device_iter_exit(struct class_dev_iter *iter)
 }
 
 int nfc_fw_download(struct nfc_dev *dev, const char *firmware_name);
-int nfc_genl_fw_download_done(struct nfc_dev *dev, const char *firmware_name);
-
-int nfc_fw_download_done(struct nfc_dev *dev, const char *firmware_name);
+int nfc_genl_fw_download_done(struct nfc_dev *dev, const char *firmware_name,
+                             u32 result);
 
 int nfc_dev_up(struct nfc_dev *dev);