Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
This commit is contained in:
commit
220b881a77
7 changed files with 26 additions and 7 deletions
|
@ -84,6 +84,8 @@ enum {
|
|||
HCI_SERVICE_CACHE,
|
||||
HCI_LINK_KEYS,
|
||||
HCI_DEBUG_KEYS,
|
||||
|
||||
HCI_RESET,
|
||||
};
|
||||
|
||||
/* HCI ioctl defines */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue