summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-02-01 14:21:56 -0500
committerJohn W. Linville <linville@tuxdriver.com>2013-02-01 14:21:56 -0500
commit5d38745fa896804ce83cb975ba6bf184d0e85ba0 (patch)
tree669644e028bc75e2ef66cd4a85e5fe873264325e /include
parente56b04efc1f795da42cf1d9651b52a4a5bebd730 (diff)
parenta3d09356491d637548dbe815ddb966f52ec9e53a (diff)
downloadcachepc-linux-5d38745fa896804ce83cb975ba6bf184d0e85ba0.tar.gz
cachepc-linux-5d38745fa896804ce83cb975ba6bf184d0e85ba0.zip
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'include')
-rw-r--r--include/net/bluetooth/hci_core.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index bcf8ffe2a843..90cf75afcb02 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -86,6 +86,7 @@ struct bdaddr_list {
struct bt_uuid {
struct list_head list;
u8 uuid[16];
+ u8 size;
u8 svc_hint;
};