diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-12 14:25:04 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-12 14:25:04 -0400 |
| commit | 0440507bbc44149e63bbfb9df730ba3820371904 (patch) | |
| tree | 7275e41aa1aa7e4d19d0503f1c15f07991c1a120 /include/net/nfc/hci.h | |
| parent | 8d242488ce4627dd7e6333caab56df11ea25e239 (diff) | |
| parent | 7f0d9f430dc99303558adc30a75eef10c43f7bec (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'include/net/nfc/hci.h')
| -rw-r--r-- | include/net/nfc/hci.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/nfc/hci.h b/include/net/nfc/hci.h index 4467c9460857..e30e6a869714 100644 --- a/include/net/nfc/hci.h +++ b/include/net/nfc/hci.h | |||
| @@ -31,7 +31,8 @@ struct nfc_hci_ops { | |||
| 31 | void (*close) (struct nfc_hci_dev *hdev); | 31 | void (*close) (struct nfc_hci_dev *hdev); |
| 32 | int (*hci_ready) (struct nfc_hci_dev *hdev); | 32 | int (*hci_ready) (struct nfc_hci_dev *hdev); |
| 33 | int (*xmit) (struct nfc_hci_dev *hdev, struct sk_buff *skb); | 33 | int (*xmit) (struct nfc_hci_dev *hdev, struct sk_buff *skb); |
| 34 | int (*start_poll) (struct nfc_hci_dev *hdev, u32 protocols); | 34 | int (*start_poll) (struct nfc_hci_dev *hdev, |
| 35 | u32 im_protocols, u32 tm_protocols); | ||
| 35 | int (*target_from_gate) (struct nfc_hci_dev *hdev, u8 gate, | 36 | int (*target_from_gate) (struct nfc_hci_dev *hdev, u8 gate, |
| 36 | struct nfc_target *target); | 37 | struct nfc_target *target); |
| 37 | int (*complete_target_discovered) (struct nfc_hci_dev *hdev, u8 gate, | 38 | int (*complete_target_discovered) (struct nfc_hci_dev *hdev, u8 gate, |