Merge branch 'x86/amd-nb' into x86/apic-cleanups

Reason: apic cleanup series depends on x86/apic, x86/amd-nb x86/platform

Conflicts:
	arch/x86/include/asm/io_apic.h

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 0 insertions, 11 deletions

diff --git a/net/tipc/zone.c b/net/tipc/zone.c
index 2c01ba2d86bf..83f8b5e91fc8 100644
--- a/net/tipc/zone.c
+++ b/net/tipc/zone.c
@@ -160,14 +160,3 @@ u32 tipc_zone_select_router(struct _zone *z_ptr, u32 addr, u32 ref)
         }
         return 0;
 }
-
-
-u32 tipc_zone_next_node(u32 addr)
-{
-        struct cluster *c_ptr = tipc_cltr_find(addr);
-
-        if (c_ptr)
-                return tipc_cltr_next_node(c_ptr, addr);
-        return 0;
-}
-