diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-28 00:57:28 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-28 00:57:28 -0800 |
| commit | 46976c042ba1ff59253f2f7a513099175c24794e (patch) | |
| tree | a7af3f1c3ef2a2d430c49fb774ab744c296a2285 /include/net/bluetooth/hci_core.h | |
| parent | 024c378f0b719d43b01b875caefa19f2612e103a (diff) | |
| parent | f6e623a65cb301088bd04794043e82bfc996c512 (diff) | |
| download | linux-3.10-46976c042ba1ff59253f2f7a513099175c24794e.tar.gz linux-3.10-46976c042ba1ff59253f2f7a513099175c24794e.tar.bz2 linux-3.10-46976c042ba1ff59253f2f7a513099175c24794e.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
Diffstat (limited to 'include/net/bluetooth/hci_core.h')
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 7b86094a894..ce3c99e5fa2 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -70,7 +70,8 @@ struct hci_dev { char name[8]; unsigned long flags; __u16 id; - __u8 type; + __u8 bus; + __u8 dev_type; bdaddr_t bdaddr; __u8 dev_name[248]; __u8 dev_class[3]; @@ -134,6 +135,8 @@ struct hci_dev { atomic_t promisc; + struct dentry *debugfs; + struct device *parent; struct device dev; |