diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-08-05 15:54:28 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-08-05 15:54:28 -0400 |
| commit | c0068c85897f06205d4c35cf4bf9161be90690e9 (patch) | |
| tree | ae8a186fff44a29454008a5d1f5891b10a861f2c /include/net | |
| parent | 2411054ae9eb7e7ef488a39912abfc4ebadbe3ad (diff) | |
| parent | adb08edea0119f7a5484a9f6a385fbcecdf85a63 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 8b28962e737e..4568b938ca35 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h | |||
| @@ -132,7 +132,7 @@ struct hci_dev { | |||
| 132 | 132 | ||
| 133 | struct inquiry_cache inq_cache; | 133 | struct inquiry_cache inq_cache; |
| 134 | struct hci_conn_hash conn_hash; | 134 | struct hci_conn_hash conn_hash; |
| 135 | struct bdaddr_list blacklist; | 135 | struct list_head blacklist; |
| 136 | 136 | ||
| 137 | struct hci_dev_stats stat; | 137 | struct hci_dev_stats stat; |
| 138 | 138 | ||