summaryrefslogtreecommitdiffstats
path: root/include/asm-ppc/topology.h
diff options
context:
space:
mode:
authorjdl@freescale.com <jdl@freescale.com>2005-09-07 15:59:48 -0500
committerPaul Mackerras <paulus@samba.org>2005-09-09 22:11:35 +1000
commitdd56fdf23dfa0127d512b73d4238dbd2b5a7c1eb (patch)
tree59f952b87d4bec5f11c578a384c3aaa2ddf5860d /include/asm-ppc/topology.h
parent64807081e38703617cf9a5d71db14ea2b3e1cb04 (diff)
downloadblackbird-op-linux-dd56fdf23dfa0127d512b73d4238dbd2b5a7c1eb.tar.gz
blackbird-op-linux-dd56fdf23dfa0127d512b73d4238dbd2b5a7c1eb.zip
[PATCH] powerpc: Merge a few more include files
Merge a few asm-ppc and asm-ppc64 header files. Note: the merge of setup.h intentionally does not carry forward the m68k cruft. That means this patch continues to break the already broken amiga on the ppc32. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Kumar Gala <kumar.gala@freescale.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-ppc/topology.h')
-rw-r--r--include/asm-ppc/topology.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-ppc/topology.h b/include/asm-ppc/topology.h
deleted file mode 100644
index 6a029bbba6e1..000000000000
--- a/include/asm-ppc/topology.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_PPC_TOPOLOGY_H
-#define _ASM_PPC_TOPOLOGY_H
-
-#include <asm-generic/topology.h>
-
-#endif /* _ASM_PPC_TOPOLOGY_H */
OpenPOWER on IntegriCloud