diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-01 20:15:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-01 20:15:25 -0400 |
| commit | 5e58e5283a0a0a99ee970e7e5c80c6541693376e (patch) | |
| tree | 40409bad22ddc6c37b23ae8e518bbd6b2f39007c /include | |
| parent | c100c8f4c3c6f2a407bdbaaad2c4f1062e6a473a (diff) | |
| parent | ffd8c746fbef50cf12df239f9d23c2afe1a2c3cb (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include')
| -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 */ |