diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-02-01 14:21:56 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-02-01 14:21:56 -0500 |
| commit | 5d38745fa896804ce83cb975ba6bf184d0e85ba0 (patch) | |
| tree | 669644e028bc75e2ef66cd4a85e5fe873264325e /include | |
| parent | e56b04efc1f795da42cf1d9651b52a4a5bebd730 (diff) | |
| parent | a3d09356491d637548dbe815ddb966f52ec9e53a (diff) | |
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.h | 1 |
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 { | |||
| 86 | struct bt_uuid { | 86 | struct bt_uuid { |
| 87 | struct list_head list; | 87 | struct list_head list; |
| 88 | u8 uuid[16]; | 88 | u8 uuid[16]; |
| 89 | u8 size; | ||
| 89 | u8 svc_hint; | 90 | u8 svc_hint; |
| 90 | }; | 91 | }; |
| 91 | 92 | ||