summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-04-01 17:15:25 -0700
committerDavid S. Miller <davem@davemloft.net>2011-04-01 17:15:25 -0700
commit5e58e5283a0a0a99ee970e7e5c80c6541693376e (patch)
tree40409bad22ddc6c37b23ae8e518bbd6b2f39007c /include
parentc100c8f4c3c6f2a407bdbaaad2c4f1062e6a473a (diff)
parentffd8c746fbef50cf12df239f9d23c2afe1a2c3cb (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.h2
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 {
HCI_SERVICE_CACHE,
HCI_LINK_KEYS,
HCI_DEBUG_KEYS,
+
+ HCI_RESET,
};
/* HCI ioctl defines */