diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 13:37:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 13:37:40 -0400 |
| commit | e16b396ce314b2bcdfe6c173fe075bf8e3432368 (patch) | |
| tree | 640f0f56f2ea676647af4eb42d32fa56be2ee549 /drivers/bluetooth | |
| parent | 7fd23a24717a327a66f3c32d11a20a2f169c824f (diff) | |
| parent | e6e8dd5055a974935af1398c8648d4a9359b0ecb (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits)
doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore
Update cpuset info & webiste for cgroups
dcdbas: force SMI to happen when expected
arch/arm/Kconfig: remove one to many l's in the word.
asm-generic/user.h: Fix spelling in comment
drm: fix printk typo 'sracth'
Remove one to many n's in a word
Documentation/filesystems/romfs.txt: fixing link to genromfs
drivers:scsi Change printk typo initate -> initiate
serial, pch uart: Remove duplicate inclusion of linux/pci.h header
fs/eventpoll.c: fix spelling
mm: Fix out-of-date comments which refers non-existent functions
drm: Fix printk typo 'failled'
coh901318.c: Change initate to initiate.
mbox-db5500.c Change initate to initiate.
edac: correct i82975x error-info reported
edac: correct i82975x mci initialisation
edac: correct commented info
fs: update comments to point correct document
target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c
...
Trivial conflict in fs/eventpoll.c (spelling vs addition)
Diffstat (limited to 'drivers/bluetooth')
| -rw-r--r-- | drivers/bluetooth/btusb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 7e0ebd4a1a74..866811428e20 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c | |||
| @@ -433,7 +433,7 @@ static void btusb_isoc_complete(struct urb *urb) | |||
| 433 | } | 433 | } |
| 434 | } | 434 | } |
| 435 | 435 | ||
| 436 | static void inline __fill_isoc_descriptor(struct urb *urb, int len, int mtu) | 436 | static inline void __fill_isoc_descriptor(struct urb *urb, int len, int mtu) |
| 437 | { | 437 | { |
| 438 | int i, offset = 0; | 438 | int i, offset = 0; |
| 439 | 439 | ||
| @@ -780,7 +780,7 @@ static void btusb_notify(struct hci_dev *hdev, unsigned int evt) | |||
| 780 | } | 780 | } |
| 781 | } | 781 | } |
| 782 | 782 | ||
| 783 | static int inline __set_isoc_interface(struct hci_dev *hdev, int altsetting) | 783 | static inline int __set_isoc_interface(struct hci_dev *hdev, int altsetting) |
| 784 | { | 784 | { |
| 785 | struct btusb_data *data = hdev->driver_data; | 785 | struct btusb_data *data = hdev->driver_data; |
| 786 | struct usb_interface *intf = data->isoc; | 786 | struct usb_interface *intf = data->isoc; |