diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-05 12:17:19 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-05 12:17:19 +1000 |
| commit | 11ead20785da16f1cda444e0f73e91eb4295b6f6 (patch) | |
| tree | 6e30e4bc3609c49fbb9bf5a4cd62ebd55f156dc9 /include | |
| parent | 229a3befa93d2003bf141bcc09b7f921f2d2f014 (diff) | |
| parent | adb08edea0119f7a5484a9f6a385fbcecdf85a63 (diff) | |
Merge remote branch 'bluetooth/master'
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 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; |