diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-11-03 10:51:26 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-11-03 10:51:26 -0400 |
| commit | 69dbdd819599e2f3b77c172e83af512845bca5ad (patch) | |
| tree | 49939d8b80ec2115a801eae2aebc21f23867c876 /net/tipc/ref.h | |
| parent | 87232dd49aeb6b7d1af291edca8bd129a82ef4b5 (diff) | |
| parent | 75e3f3137cb570661c2ad3035a139dda671fbb63 (diff) | |
Merge branch 'fix/asoc' into for-linus
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 7e3798ea93b9..5bc8e7ab84de 100644 --- a/net/tipc/ref.h +++ b/net/tipc/ref.h | |||
| @@ -44,7 +44,6 @@ u32 tipc_ref_acquire(void *object, spinlock_t **lock); | |||
| 44 | void tipc_ref_discard(u32 ref); | 44 | void tipc_ref_discard(u32 ref); |
| 45 | 45 | ||
| 46 | void *tipc_ref_lock(u32 ref); | 46 | void *tipc_ref_lock(u32 ref); |
| 47 | void tipc_ref_unlock(u32 ref); | ||
| 48 | void *tipc_ref_deref(u32 ref); | 47 | void *tipc_ref_deref(u32 ref); |
| 49 | 48 | ||
| 50 | #endif | 49 | #endif |