diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-07-31 15:15:50 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-07-31 15:15:50 -0400 |
| commit | 11a45820d02ee78ad22bb95d5abb94950a355d8d (patch) | |
| tree | 43ac5d0277ec5939875cf8e1863245bd60f5b51a /include/net/nfc/hci.h | |
| parent | 704278ccb5c9fcbe09d1be3657950c17fad18ba8 (diff) | |
| parent | 9ea7187c53f63e31f2d1b2b1e474e31808565009 (diff) | |
Merge tag 'nfc-fixes-3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-fixes
Samuel Ortiz <sameo@linux.intel.com> says:
'This is the second NFC fixes pull request for 3.11.
We have:
- A build failure fix for the NCI SPI transport layer due to a
missing CRC_CCITT Kconfig dependency.
- A netlink command rename: CMD_FW_UPLOAD was merged during the 3.11
merge window but the typical terminology for loading a firmware to a
target is firmware download rather than upload. In order to avoid any
confusion in a file exported to userspace, we rename this command into
CMD_FW_DOWNLOAD."
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net/nfc/hci.h')
| -rw-r--r-- | include/net/nfc/hci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/nfc/hci.h b/include/net/nfc/hci.h index 0af851c3b03..b64b7bce4b9 100644 --- a/include/net/nfc/hci.h +++ b/include/net/nfc/hci.h @@ -59,7 +59,7 @@ struct nfc_hci_ops { struct nfc_target *target); int (*event_received)(struct nfc_hci_dev *hdev, u8 gate, u8 event, struct sk_buff *skb); - int (*fw_upload)(struct nfc_hci_dev *hdev, const char *firmware_name); + int (*fw_download)(struct nfc_hci_dev *hdev, const char *firmware_name); int (*discover_se)(struct nfc_hci_dev *dev); int (*enable_se)(struct nfc_hci_dev *dev, u32 se_idx); int (*disable_se)(struct nfc_hci_dev *dev, u32 se_idx); |