diff options
author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-03-31 21:26:01 +0200 |
---|---|---|
committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-03-31 21:26:01 +0200 |
commit | 220b881a77eca96afdd6037dbca3441e8938228f (patch) | |
tree | 51d1a273521238b5127409c9ea2c0b2df02ec6e9 /include/net | |
parent | Bluetooth: Add local Extended Inquiry Response (EIR) support (diff) | |
parent | Bluetooth: Fix warning with hci_cmd_timer (diff) | |
download | linux-220b881a77eca96afdd6037dbca3441e8938228f.tar.xz linux-220b881a77eca96afdd6037dbca3441e8938228f.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/bluetooth/hci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 6846ec02dcb0..6138e313d175 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -84,6 +84,8 @@ enum { HCI_SERVICE_CACHE, HCI_LINK_KEYS, HCI_DEBUG_KEYS, + + HCI_RESET, }; /* HCI ioctl defines */ |