diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-05-06 20:37:42 +0300 |
---|---|---|
committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-05-06 20:37:42 +0300 |
commit | cebeb0f1885fa93c44be5d4e0b9b640210ff088c (patch) | |
tree | a33e4af4ddaa7a57f997ab9a2baceb48209670cd /net/tipc/ref.h | |
parent | 939ecf6b14c46e3448411a934418311b492bfee4 (diff) | |
parent | 48d11dc37977614a461bfedddc52d1c651bc279f (diff) |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'net/tipc/ref.h')
-rw-r--r-- | net/tipc/ref.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/tipc/ref.h b/net/tipc/ref.h index 5bc8e7ab84de8..d01aa1df63b86 100644 --- a/net/tipc/ref.h +++ b/net/tipc/ref.h @@ -44,6 +44,5 @@ u32 tipc_ref_acquire(void *object, spinlock_t **lock); void tipc_ref_discard(u32 ref); void *tipc_ref_lock(u32 ref); -void *tipc_ref_deref(u32 ref); #endif |