summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-08-05 23:54:28 +0400
committerJohn W. Linville <linville@tuxdriver.com>2010-08-05 23:54:28 +0400
commitc0068c85897f06205d4c35cf4bf9161be90690e9 (patch)
treeae8a186fff44a29454008a5d1f5891b10a861f2c /include/net
parent2411054ae9eb7e7ef488a39912abfc4ebadbe3ad (diff)
parentadb08edea0119f7a5484a9f6a385fbcecdf85a63 (diff)
downloadlinux-c0068c85897f06205d4c35cf4bf9161be90690e9.tar.xz
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.h2
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 {
struct inquiry_cache inq_cache;
struct hci_conn_hash conn_hash;
- struct bdaddr_list blacklist;
+ struct list_head blacklist;
struct hci_dev_stats stat;