summaryrefslogtreecommitdiff
path: root/arch/m68k/include/asm/topology.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-04 14:54:56 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-04 14:54:56 +0100
commitbb960a1e42042e82447a5bc0941b3ab6d614bac3 (patch)
treed2295a923fabb1b01b25bb015c4c2e42ee9df5ca /arch/m68k/include/asm/topology.h
parent858770619debfb9269add63e4ba8b7c6b5538dd1 (diff)
parent06fc732c33a7ff5e4c91bcf4a6ca86b5e335ad9a (diff)
downloadlwn-bb960a1e42042e82447a5bc0941b3ab6d614bac3.tar.gz
lwn-bb960a1e42042e82447a5bc0941b3ab6d614bac3.zip
Merge branch 'core/xen' into x86/urgent
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 */