ia64: Clean up ia64 version of topology.h.

include/asm-ia64/topology.h

@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002, Erich Focht, NEC
  *
- * All rights reserved.          
+ * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,14 +32,14 @@
 #define __memblk_to_node(memblk) (memblk)
 #endif
 
-/* 
+/*
  * Returns the number of the node containing Node 'nid'.
  * Not implemented here. Multi-level hierarchies detected with
  * the help of node_distance().
  */
 #define __parent_node(nid) (nid)
 
-/* 
+/*
  * Returns the number of the first CPU on Node 'node'.
  * Slow in the current implementation.
  * Who needs this?
@@ -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)
@@ -56,7 +56,7 @@ static inline int __node_to_first_cpu(int node)
 	return -1;
 }
 
-/* 
+/*
  * Returns a bitmask of CPUs on Node 'node'.
  */
 static inline unsigned long __node_to_cpu_mask(int 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 */