diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-19 17:59:44 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-19 17:59:44 -0400 |
| commit | c7c350e92aab1bba68f26a6027b734adcf9824ba (patch) | |
| tree | aa99bd94c3049dd871d9c030d70a5f3d87591a95 /net/bluetooth/bnep/bnep.h | |
| parent | 2f42b5d043ee271d1e5d30ecd77186b6c4d4e534 (diff) | |
| parent | f8512ad0da16cbe156f3a7627971cdf0b39c4138 (diff) | |
Merge branch 'hotfixes' into devel
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 | { |