diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/bluetooth/hci_ll.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/bluetooth/hci_ll.c')
| -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 |