diff options
author | Mark Brown <broonie@linaro.org> | 2013-08-09 20:26:31 +0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-08-09 20:26:31 +0400 |
commit | c7abc19ca6d48392f91ca04ebe1e9813b3ace435 (patch) | |
tree | c23540ea1425e9891b39cdff550e90caaba38163 /include/net/nfc/hci.h | |
parent | d60990d597bfa2816dfe28a5c5c6787610b423e6 (diff) | |
parent | c095ba7224d8edc71dcef0d655911399a8bd4a3f (diff) | |
download | linux-c7abc19ca6d48392f91ca04ebe1e9813b3ace435.tar.xz |
Merge tag 'v3.11-rc4' into spi-bitbang
Linux 3.11-rc4
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 0af851c3b038..b64b7bce4b94 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); |