diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-18 16:50:52 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-18 16:50:52 -0400 |
| commit | cff6bf970965c98c62007fc8a36527fd147fe233 (patch) | |
| tree | 2791f2208b54ade86625af416ff5342f11282f0c /drivers/bluetooth/hci_usb.c | |
| parent | 6cd7525a00f3b926e8bd2e402954ed3e09a8e924 (diff) | |
| parent | 39ca371c45b04cd50d0974030ae051906fc516b6 (diff) | |
Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/bluetooth/hci_usb.c')
| -rw-r--r-- | drivers/bluetooth/hci_usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c index 57c48bbf6fe6..6756cb20b753 100644 --- a/drivers/bluetooth/hci_usb.c +++ b/drivers/bluetooth/hci_usb.c | |||
| @@ -132,7 +132,7 @@ static struct usb_device_id blacklist_ids[] = { | |||
| 132 | { } /* Terminating entry */ | 132 | { } /* Terminating entry */ |
| 133 | }; | 133 | }; |
| 134 | 134 | ||
| 135 | static struct _urb *_urb_alloc(int isoc, unsigned int __nocast gfp) | 135 | static struct _urb *_urb_alloc(int isoc, gfp_t gfp) |
| 136 | { | 136 | { |
| 137 | struct _urb *_urb = kmalloc(sizeof(struct _urb) + | 137 | struct _urb *_urb = kmalloc(sizeof(struct _urb) + |
| 138 | sizeof(struct usb_iso_packet_descriptor) * isoc, gfp); | 138 | sizeof(struct usb_iso_packet_descriptor) * isoc, gfp); |