git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel'
[pandora-kernel.git]
/
drivers
/
bluetooth
/
hci_usb.h
diff --git
a/drivers/bluetooth/hci_usb.h
b/drivers/bluetooth/hci_usb.h
index
963fc55
..
414080a
100644
(file)
--- a/
drivers/bluetooth/hci_usb.h
+++ b/
drivers/bluetooth/hci_usb.h
@@
-60,11
+60,6
@@
struct _urb {
struct urb urb;
};
struct urb urb;
};
-static inline void _urb_free(struct _urb *_urb)
-{
- kfree(_urb);
-}
-
static inline void _urb_queue_init(struct _urb_queue *q)
{
INIT_LIST_HEAD(&q->head);
static inline void _urb_queue_init(struct _urb_queue *q)
{
INIT_LIST_HEAD(&q->head);
@@
-102,9
+97,9
@@
struct hci_usb {
struct hci_dev *hdev;
unsigned long state;
struct hci_dev *hdev;
unsigned long state;
-
+
struct usb_device *udev;
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;
struct usb_host_endpoint *bulk_in_ep;
struct usb_host_endpoint *bulk_out_ep;
struct usb_host_endpoint *intr_in_ep;
@@
-116,7
+111,6
@@
struct hci_usb {
__u8 ctrl_req;
struct sk_buff_head transmit_q[4];
__u8 ctrl_req;
struct sk_buff_head transmit_q[4];
- struct sk_buff *reassembly[4]; /* Reassembly buffers */
rwlock_t completion_lock;
rwlock_t completion_lock;