diff options
| author | Pekka Enberg <penberg@kernel.org> | 2010-10-24 12:57:05 -0400 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2010-10-24 12:57:05 -0400 |
| commit | 6d4121f6c20a0e86231d52f535f1c82423b3326f (patch) | |
| tree | 5c235cac699ca86b504850aa663ddadde0455a61 /net/tipc/ref.h | |
| parent | 92a5bbc11ff2442a54b2f1d313088c245828ef4e (diff) | |
| parent | 35da7a307c535f9c2929cae277f3df425c9f9b1e (diff) | |
Merge branch 'master' into for-linus
Conflicts:
include/linux/percpu.h
mm/percpu.c
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 |