diff options
| author | David S. Miller <davem@davemloft.net> | 2010-08-06 22:30:43 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-06 22:30:43 +0200 |
| commit | e225567960db50e9810a152c8621c7a6ed94de71 (patch) | |
| tree | d0129e2988f8aea56d4f00f04c4818c2e8cc07a2 /include/net | |
| parent | isdn: fix information leak (diff) | |
| parent | iwlwifi: fix locking assertions (diff) | |
| download | linux-e225567960db50e9810a152c8621c7a6ed94de71.tar.xz linux-e225567960db50e9810a152c8621c7a6ed94de71.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-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 { struct inquiry_cache inq_cache; struct hci_conn_hash conn_hash; - struct bdaddr_list blacklist; + struct list_head blacklist; struct hci_dev_stats stat; |