ia64: Clean up ia64 version of topology.h.

include/asm-ia64/topology.h

@@ -47,7 +47,7 @@
 /* #define __node_to_first_cpu(node) pool_cpus[pool_ptr[node]] */
 static inline int __node_to_first_cpu(int node)
 {
-	int i, cpu;
+	int i;
 
 	for (i=0; i<NR_CPUS; i++)
 		if (__cpu_to_node(i)==node)
@@ -77,9 +77,3 @@ static inline unsigned long __node_to_cpu_mask(int node)
 #define __node_to_memblk(node) (node)
 
 #endif /* _ASM_IA64_TOPOLOGY_H */
-#ifndef _ASM_IA64_TOPOLOGY_H
-#define _ASM_IA64_TOPOLOGY_H
-
-#include <asm-generic/topology.h>
-
-#endif /* _ASM_IA64_TOPOLOGY_H */