diff options
| author | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2013-09-27 10:56:14 -0400 |
|---|---|---|
| committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2013-09-27 10:56:14 -0400 |
| commit | 1025c04cecd19882e28f16c4004034b475c372c5 (patch) | |
| tree | 2b7402887e86d54bff5a123228c9059eae5e32bd /include/net/bluetooth/hci.h | |
| parent | 4375f1037d52602413142e290608d0d84671ad36 (diff) | |
| parent | 5bcecf325378218a8e248bb6bcae96ec7362f8ef (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Conflicts:
net/bluetooth/hci_core.c
Diffstat (limited to 'include/net/bluetooth/hci.h')
| -rw-r--r-- | include/net/bluetooth/hci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 22d6e664612a..7ede2666dc75 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h | |||
| @@ -104,6 +104,7 @@ enum { | |||
| 104 | enum { | 104 | enum { |
| 105 | HCI_SETUP, | 105 | HCI_SETUP, |
| 106 | HCI_AUTO_OFF, | 106 | HCI_AUTO_OFF, |
| 107 | HCI_RFKILLED, | ||
| 107 | HCI_MGMT, | 108 | HCI_MGMT, |
| 108 | HCI_PAIRABLE, | 109 | HCI_PAIRABLE, |
| 109 | HCI_SERVICE_CACHE, | 110 | HCI_SERVICE_CACHE, |