diff options
| author | David S. Miller <davem@davemloft.net> | 2010-08-06 16:30:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-06 16:30:43 -0400 |
| commit | e225567960db50e9810a152c8621c7a6ed94de71 (patch) | |
| tree | d0129e2988f8aea56d4f00f04c4818c2e8cc07a2 /include | |
| parent | 4b030d4288a569d6bdeca884d7f102d951f097f2 (diff) | |
| parent | a24d52f390a77ce90dc8cf0cd75d27ec0a6ea3f8 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include')
| -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 8b28962e737..4568b938ca3 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 | ||