aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGustavo F. Padovan <padovan@profusion.mobi>2011-03-31 16:26:01 -0300
committerGustavo F. Padovan <padovan@profusion.mobi>2011-03-31 16:26:01 -0300
commit220b881a77eca96afdd6037dbca3441e8938228f (patch)
tree51d1a273521238b5127409c9ea2c0b2df02ec6e9 /include
parent80a1e1dbf62a08984d4c1bfb5a4bca38c3e1664f (diff)
parent6f5ef998b7b0b1bf1471654bf6176a5419197128 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
Diffstat (limited to 'include')
-rw-r--r--include/net/bluetooth/hci.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 6846ec02dcb..6138e313d17 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 */