diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-08-01 20:30:59 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-08-01 20:30:59 +0200 |
| commit | 22e02a0272e5291a40ca28d2b7aea5231c832077 (patch) | |
| tree | 04630aa6452458c643a3af6fd2c296609beef2c6 /include/uapi | |
| parent | bridge: disable snooping if there is no querier (diff) | |
| parent | Merge tag 'nfc-fixes-3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| download | linux-22e02a0272e5291a40ca28d2b7aea5231c832077.tar.xz linux-22e02a0272e5291a40ca28d2b7aea5231c832077.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/nfc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/uapi/linux/nfc.h b/include/uapi/linux/nfc.h index caed0f324d5f..8137dd8d2adf 100644 --- a/include/uapi/linux/nfc.h +++ b/include/uapi/linux/nfc.h @@ -69,8 +69,8 @@ * starting a poll from a device which has a secure element enabled means * we want to do SE based card emulation. * @NFC_CMD_DISABLE_SE: Disable the physical link to a specific secure element. - * @NFC_CMD_FW_UPLOAD: Request to Load/flash firmware, or event to inform that - * some firmware was loaded + * @NFC_CMD_FW_DOWNLOAD: Request to Load/flash firmware, or event to inform + * that some firmware was loaded */ enum nfc_commands { NFC_CMD_UNSPEC, @@ -94,7 +94,7 @@ enum nfc_commands { NFC_CMD_DISABLE_SE, NFC_CMD_LLC_SDREQ, NFC_EVENT_LLC_SDRES, - NFC_CMD_FW_UPLOAD, + NFC_CMD_FW_DOWNLOAD, NFC_EVENT_SE_ADDED, NFC_EVENT_SE_REMOVED, /* private: internal use only */ |