diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-01-05 15:12:45 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-01-05 15:13:24 (GMT) |
| commit | 1032c736e81cdf490ae62f86da7efe67c3c3e61d (patch) | |
| tree | a0c3919849f97dbbc5ea7c6a9ac1d7a639e44a73 /include/linux | |
| parent | 117ff42fd43e92d24c6aa6f3e4f0f1e1edada140 (diff) | |
| parent | cb00ec382b57d35b955c085198cd54a0c1fcdc94 (diff) | |
| download | linux-fsl-qoriq-1032c736e81cdf490ae62f86da7efe67c3c3e61d.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/b43legacy/dma.c
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/nfc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/nfc.h b/include/linux/nfc.h index 89fee4a..01d4e5d 100644 --- a/include/linux/nfc.h +++ b/include/linux/nfc.h @@ -88,6 +88,7 @@ enum nfc_commands { * @NFC_ATTR_TARGET_SENS_RES: NFC-A targets extra information such as NFCID * @NFC_ATTR_TARGET_SEL_RES: NFC-A targets extra information (useful if the * target is not NFC-Forum compliant) + * @NFC_ATTR_TARGET_NFCID1: NFC-A targets identifier, max 10 bytes * @NFC_ATTR_COMM_MODE: Passive or active mode * @NFC_ATTR_RF_MODE: Initiator or target */ @@ -99,6 +100,7 @@ enum nfc_attrs { NFC_ATTR_TARGET_INDEX, NFC_ATTR_TARGET_SENS_RES, NFC_ATTR_TARGET_SEL_RES, + NFC_ATTR_TARGET_NFCID1, NFC_ATTR_COMM_MODE, NFC_ATTR_RF_MODE, /* private: internal use only */ |