summaryrefslogtreecommitdiff
path: root/net/tipc/ref.h
diff options
context:
space:
mode:
authorPaul Moore <pmoore@redhat.com>2014-06-18 01:30:23 +0400
committerPaul Moore <pmoore@redhat.com>2014-06-18 01:30:23 +0400
commit170b5910d9fbea79de1bb40df22eda5f98250c0c (patch)
treeca9560e878d2842d45c6f99077d0d8b8f8b0f9ba /net/tipc/ref.h
parent47dd0b76ace953bd2c0479076db0d3e3b9594003 (diff)
parent1860e379875dfe7271c649058aeddffe5afd9d0d (diff)
downloadlinux-170b5910d9fbea79de1bb40df22eda5f98250c0c.tar.xz
Merge tag 'v3.15' into next
Linux 3.15
Diffstat (limited to 'net/tipc/ref.h')
-rw-r--r--net/tipc/ref.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/tipc/ref.h b/net/tipc/ref.h
index 5bc8e7ab84de..d01aa1df63b8 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