diff options
| author | David S. Miller <davem@davemloft.net> | 2017-11-13 10:39:12 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-13 10:39:12 +0900 |
| commit | 6afce196236c353819526a1c41fffb6d660eb2ef (patch) | |
| tree | 0f36138ffe416377540d5c8541d338ba4a25a4fb /include/uapi/linux | |
| parent | fd9080a39bede82a5123fa322ae9e3d7f0a93e72 (diff) | |
| parent | 4d63adfe12dd9cb61ed8badb4d798955399048c2 (diff) | |
Merge tag 'nfc-next-4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
Samuel Ortiz says:
====================
NFC 4.15 pull request
This is the NFC pull request for 4.15. We have:
- A new netlink command for explicitly deactivating NFC targets
- i2c constification for all NFC drivers
- One NFC device allocation error path fix
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/nfc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/nfc.h b/include/uapi/linux/nfc.h index 399f39ff8048..f6e3c8c9c744 100644 --- a/include/uapi/linux/nfc.h +++ b/include/uapi/linux/nfc.h @@ -89,6 +89,7 @@ * @NFC_CMD_ACTIVATE_TARGET: Request NFC controller to reactivate target. * @NFC_CMD_VENDOR: Vendor specific command, to be implemented directly * from the driver in order to support hardware specific operations. + * @NFC_CMD_DEACTIVATE_TARGET: Request NFC controller to deactivate target. */ enum nfc_commands { NFC_CMD_UNSPEC, @@ -121,6 +122,7 @@ enum nfc_commands { NFC_CMD_SE_IO, NFC_CMD_ACTIVATE_TARGET, NFC_CMD_VENDOR, + NFC_CMD_DEACTIVATE_TARGET, /* private: internal use only */ __NFC_CMD_AFTER_LAST }; |