diff options
| author | Sage Weil <sage@inktank.com> | 2012-06-15 19:32:04 (GMT) |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2012-06-15 19:32:04 (GMT) |
| commit | 9a64e8e0ace51b309fdcff4b4754b3649250382a (patch) | |
| tree | 1f0d75c196c5ab0408c55ed6cf3a152f1f921e15 /net/tipc/config.h | |
| parent | f3dea7edd3d449fe7a6d402c1ce56a294b985261 (diff) | |
| parent | f8f5701bdaf9134b1f90e5044a82c66324d2073f (diff) | |
| download | linux-fsl-qoriq-9a64e8e0ace51b309fdcff4b4754b3649250382a.tar.xz | |
Merge tag 'v3.5-rc1'
Linux 3.5-rc1
Conflicts:
net/ceph/messenger.c
Diffstat (limited to 'net/tipc/config.h')
| -rw-r--r-- | net/tipc/config.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/tipc/config.h b/net/tipc/config.h index 80da6eb..1f252f3 100644 --- a/net/tipc/config.h +++ b/net/tipc/config.h @@ -66,6 +66,7 @@ struct sk_buff *tipc_cfg_do_cmd(u32 orig_node, u16 cmd, int headroom); int tipc_cfg_init(void); +void tipc_cfg_reinit(void); void tipc_cfg_stop(void); #endif |