diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-04-07 14:15:50 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-04-07 14:15:50 -0400 |
| commit | 454abcc57f1d48a976291bc4af73b5f087e21d70 (patch) | |
| tree | 5bba999ea3f31527da02b60604531cc5fb52ea57 /include/net/bluetooth/hci.h | |
| parent | 88aab9341a315d81118be6b41c45e4fe32b94bc1 (diff) | |
| parent | 6221f222c0ebf1acdf7abcf927178f40e1a65e2a (diff) | |
Merge commit 'v2.6.39-rc2' into spi/merge
Diffstat (limited to 'include/net/bluetooth/hci.h')
| -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 */ |