diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-07-12 06:37:40 +0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-12 06:37:40 +0400 |
| commit | 50b65cc6fa3a69bdfbc8b3342d8ca6ddbbf5ec88 (patch) | |
| tree | 12d6cd90cc58808fb78986116502dac82df4f512 /drivers/bluetooth/hci_usb.h | |
| parent | 29578624e354f56143d92510fff33a8b2aaa2c03 (diff) | |
| parent | 5b7f990927fe87ad3bec762a33c0e72bcbf6841e (diff) | |
| download | linux-50b65cc6fa3a69bdfbc8b3342d8ca6ddbbf5ec88.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'drivers/bluetooth/hci_usb.h')
| -rw-r--r-- | drivers/bluetooth/hci_usb.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/bluetooth/hci_usb.h b/drivers/bluetooth/hci_usb.h index 963fc55cdc85..56cd3a92ceca 100644 --- a/drivers/bluetooth/hci_usb.h +++ b/drivers/bluetooth/hci_usb.h @@ -102,9 +102,9 @@ struct hci_usb { struct hci_dev *hdev; unsigned long state; - + struct usb_device *udev; - + struct usb_host_endpoint *bulk_in_ep; struct usb_host_endpoint *bulk_out_ep; struct usb_host_endpoint *intr_in_ep; @@ -116,7 +116,6 @@ struct hci_usb { __u8 ctrl_req; struct sk_buff_head transmit_q[4]; - struct sk_buff *reassembly[4]; /* Reassembly buffers */ rwlock_t completion_lock; |