summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-09-26 13:47:05 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-09-26 13:47:05 -0400
commit7c6a4acc645cdd938300d5f9bb367f72170af310 (patch)
tree163913f10cbab4cad448995848390c200a35d149 /include
parentb75ff5e84bb6c2d43a8ec39b240c80f0543821f0 (diff)
parent5bcecf325378218a8e248bb6bcae96ec7362f8ef (diff)
downloadlinux-stable-7c6a4acc645cdd938300d5f9bb367f72170af310.tar.gz
linux-stable-7c6a4acc645cdd938300d5f9bb367f72170af310.tar.bz2
linux-stable-7c6a4acc645cdd938300d5f9bb367f72170af310.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Diffstat (limited to 'include')
-rw-r--r--include/net/bluetooth/hci.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index aaeaf0938ec0..15f10841e2b5 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -104,6 +104,7 @@ enum {
enum {
HCI_SETUP,
HCI_AUTO_OFF,
+ HCI_RFKILLED,
HCI_MGMT,
HCI_PAIRABLE,
HCI_SERVICE_CACHE,