diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-09-26 13:38:51 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-09-26 13:38:51 -0400 |
| commit | 30d3c071a64ad8a0aaef8fbd9513698889456680 (patch) | |
| tree | ec2402c9730db5a7b735d0d25025456d2b34d264 /include/net/bluetooth/hci_core.h | |
| parent | 330bd4ec9d046a6e6f8b7cf4a53c2d15b7705e00 (diff) | |
| parent | 565766b087a6d6ff257f5b79c8ceda0188c9169f (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'include/net/bluetooth/hci_core.h')
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 206b92bfeebb..37ff1aef0845 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -926,7 +926,6 @@ int hci_remove_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr); void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb); int hci_recv_frame(struct hci_dev *hdev, struct sk_buff *skb); -int hci_recv_fragment(struct hci_dev *hdev, int type, void *data, int count); int hci_recv_stream_fragment(struct hci_dev *hdev, void *data, int count); void hci_init_sysfs(struct hci_dev *hdev); |