diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
| commit | 42933bac11e811f02200c944d8562a15f8ec4ff0 (patch) | |
| tree | fcdd9afe56eb0e746565ddd1f92f22d36678b843 /drivers/bluetooth | |
| parent | 2b9accbee563f535046ff2cd382d0acaa92e130c (diff) | |
| parent | 25985edcedea6396277003854657b5f3cb31a628 (diff) | |
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
Fix common misspellings
Diffstat (limited to 'drivers/bluetooth')
| -rw-r--r-- | drivers/bluetooth/hci_ll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bluetooth/hci_ll.c b/drivers/bluetooth/hci_ll.c index 38595e782d02..7e4b435f79f0 100644 --- a/drivers/bluetooth/hci_ll.c +++ b/drivers/bluetooth/hci_ll.c | |||
| @@ -207,7 +207,7 @@ static void ll_device_want_to_wakeup(struct hci_uart *hu) | |||
| 207 | /* | 207 | /* |
| 208 | * This state means that both the host and the BRF chip | 208 | * This state means that both the host and the BRF chip |
| 209 | * have simultaneously sent a wake-up-indication packet. | 209 | * have simultaneously sent a wake-up-indication packet. |
| 210 | * Traditionaly, in this case, receiving a wake-up-indication | 210 | * Traditionally, in this case, receiving a wake-up-indication |
| 211 | * was enough and an additional wake-up-ack wasn't needed. | 211 | * was enough and an additional wake-up-ack wasn't needed. |
| 212 | * This has changed with the BRF6350, which does require an | 212 | * This has changed with the BRF6350, which does require an |
| 213 | * explicit wake-up-ack. Other BRF versions, which do not | 213 | * explicit wake-up-ack. Other BRF versions, which do not |