diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /include/net/bluetooth | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'include/net/bluetooth')
| -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 ec6acf2f1c0b..2c0d309c7381 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h | |||
| @@ -84,6 +84,8 @@ enum { | |||
| 84 | HCI_SERVICE_CACHE, | 84 | HCI_SERVICE_CACHE, |
| 85 | HCI_LINK_KEYS, | 85 | HCI_LINK_KEYS, |
| 86 | HCI_DEBUG_KEYS, | 86 | HCI_DEBUG_KEYS, |
| 87 | |||
| 88 | HCI_RESET, | ||
| 87 | }; | 89 | }; |
| 88 | 90 | ||
| 89 | /* HCI ioctl defines */ | 91 | /* HCI ioctl defines */ |