diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-09-26 13:47:05 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-09-26 13:47:05 -0400 |
| commit | 7c6a4acc645cdd938300d5f9bb367f72170af310 (patch) | |
| tree | 163913f10cbab4cad448995848390c200a35d149 /include | |
| parent | b75ff5e84bb6c2d43a8ec39b240c80f0543821f0 (diff) | |
| parent | 5bcecf325378218a8e248bb6bcae96ec7362f8ef (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Diffstat (limited to 'include')
| -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 aaeaf0938ec0..15f10841e2b5 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, |