diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-04 21:04:04 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-04 21:04:04 +0200 |
| commit | 8040d77688014987ca5738bf1731db72ab273441 (patch) | |
| tree | 99caf0f4ca88eeeb6e2b812a4002c5c0387f3ef9 /net/tipc/name_table.h | |
| parent | fb481dd56adf3c5b0993b8f052cc9ba966e3959d (diff) | |
| parent | 268364a0f48aee2f851f9d1ef8a6cda0f3039ef1 (diff) | |
Merge branch 'core/resources' into x86/core
Diffstat (limited to 'net/tipc/name_table.h')
| -rw-r--r-- | net/tipc/name_table.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/name_table.h b/net/tipc/name_table.h index b9e7cd336d76..139882d4ed00 100644 --- a/net/tipc/name_table.h +++ b/net/tipc/name_table.h @@ -76,7 +76,7 @@ struct publication { u32 node; u32 ref; u32 key; - struct node_subscr subscr; + struct tipc_node_subscr subscr; struct list_head local_list; struct list_head pport_list; struct publication *node_list_next; |