Linus,
	This patch fixes 2 files where non-NUMA macros are redefined, rather 
than including the generic non-NUMA ones already defined.

Please apply.

[mcd@arrakis patches]$ diffstat use_generic_topo-2.5.47.patch
  asm-alpha/topology.h |   19 +++++++------------
  asm-ppc64/topology.h |    8 ++------
  2 files changed, 9 insertions(+), 18 deletions(-)

Cheers!

-Matt