diff options
author | Steve French <sfrench@us.ibm.com> | 2008-03-14 15:29:18 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2008-03-14 15:29:18 -0400 |
commit | ebe8912be214662c8289977fb416c1f015df4a0b (patch) | |
tree | cb82c552c602e5ae1a4bd8c11bd171bf88a58c35 /net/bluetooth/bnep/bnep.h | |
parent | 50531444fac593c8c8e3ff2e41944d9507bb4665 (diff) | |
parent | dba92d3bc49c036056a48661d2d8fefe4c78375a (diff) |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/bluetooth/bnep/bnep.h')
-rw-r--r-- | net/bluetooth/bnep/bnep.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/bnep/bnep.h b/net/bluetooth/bnep/bnep.h index a2992280c3d1..e69244dd8de8 100644 --- a/net/bluetooth/bnep/bnep.h +++ b/net/bluetooth/bnep/bnep.h | |||
@@ -174,7 +174,7 @@ struct bnep_session { | |||
174 | 174 | ||
175 | void bnep_net_setup(struct net_device *dev); | 175 | void bnep_net_setup(struct net_device *dev); |
176 | int bnep_sock_init(void); | 176 | int bnep_sock_init(void); |
177 | int bnep_sock_cleanup(void); | 177 | void bnep_sock_cleanup(void); |
178 | 178 | ||
179 | static inline int bnep_mc_hash(__u8 *addr) | 179 | static inline int bnep_mc_hash(__u8 *addr) |
180 | { | 180 | { |