summaryrefslogtreecommitdiff
path: root/arch/m68k/include/asm/topology.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-12 13:08:57 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-12 13:08:57 +0100
commit871cafcc962fa1655c44b4f0e54d4c5cc14e273c (patch)
treefdb7bc65d2606c85b7be6c33ba0dfd5b4e472245 /arch/m68k/include/asm/topology.h
parentcf2592f59c0e8ed4308adbdb2e0a88655379d579 (diff)
parentb578f3fcca1e78624dfb5f358776e63711d7fda2 (diff)
Merge branch 'linus' into core/softlockup
Diffstat (limited to 'arch/m68k/include/asm/topology.h')
-rw-r--r--arch/m68k/include/asm/topology.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/topology.h b/arch/m68k/include/asm/topology.h
new file mode 100644
index 000000000000..ca173e9f26ff
--- /dev/null
+++ b/arch/m68k/include/asm/topology.h
@@ -0,0 +1,6 @@
+#ifndef _ASM_M68K_TOPOLOGY_H
+#define _ASM_M68K_TOPOLOGY_H
+
+#include <asm-generic/topology.h>
+
+#endif /* _ASM_M68K_TOPOLOGY_H */