diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-09-27 19:09:17 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-09-27 19:11:17 +0200 |
| commit | 0a878747e18d4d14c5b772dcddddd86bb4c26f8f (patch) | |
| tree | b214678a35945e2c84a82192df79472923fdbcba /include/net | |
| parent | Merge branch 'fixes-for-3.12' of git://gitorious.org/linux-can/linux-can (diff) | |
| parent | brcmsmac: call bcma_core_pci_power_save() from non-atomic context (diff) | |
| download | linux-0a878747e18d4d14c5b772dcddddd86bb4c26f8f.tar.xz linux-0a878747e18d4d14c5b772dcddddd86bb4c26f8f.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Also fixed-up a badly indented closing brace...
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net')
| -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 { enum { HCI_SETUP, HCI_AUTO_OFF, + HCI_RFKILLED, HCI_MGMT, HCI_PAIRABLE, HCI_SERVICE_CACHE, |