diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-09-28 11:11:16 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-09-28 11:11:16 -0400 |
| commit | c487606f835a93a725bac1aefd536be98f22474d (patch) | |
| tree | c77571a519905945e24a9ea6e4e44d9032fd527d /include/net/nfc/nfc.h | |
| parent | d9f72f359e00a45a6cd7cc2d5121b04b9dc927e1 (diff) | |
| parent | 97ea6d0f3eb019891038cd2dfddb749d6bf219be (diff) | |
| download | linux-c487606f835a93a725bac1aefd536be98f22474d.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
net/nfc/netlink.c
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net/nfc/nfc.h')
| -rw-r--r-- | include/net/nfc/nfc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/nfc/nfc.h b/include/net/nfc/nfc.h index 6735909f826d..f05b10682c9d 100644 --- a/include/net/nfc/nfc.h +++ b/include/net/nfc/nfc.h @@ -72,6 +72,7 @@ struct nfc_ops { #define NFC_TARGET_IDX_ANY -1 #define NFC_MAX_GT_LEN 48 +#define NFC_ATR_RES_GT_OFFSET 15 struct nfc_target { u32 idx; @@ -112,7 +113,6 @@ struct nfc_dev { int tx_tailroom; struct timer_list check_pres_timer; - struct workqueue_struct *check_pres_wq; struct work_struct check_pres_work; struct nfc_ops *ops; |