diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-07 21:07:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-07 21:07:33 -0400 |
| commit | 3d8cd0c5d75c424f986c0602dc26579fbb7c8080 (patch) | |
| tree | 03c61f81542f6c34e32eb5e0dfc3d34668f88fdd /arch/m68knommu/include/asm/topology.h | |
| parent | 4c514a5ad1314b872e3185dabaf105c81d39d7e8 (diff) | |
| parent | 58750139001bae11a1f9b074f3a9c774fecf5ba8 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
Move all of include/asm-m68knommu to arch/m68knommu/include/asm.
Diffstat (limited to 'arch/m68knommu/include/asm/topology.h')
| -rw-r--r-- | arch/m68knommu/include/asm/topology.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/m68knommu/include/asm/topology.h b/arch/m68knommu/include/asm/topology.h new file mode 100644 index 000000000000..ca173e9f26ff --- /dev/null +++ b/arch/m68knommu/include/asm/topology.h | |||
| @@ -0,0 +1,6 @@ | |||
| 1 | #ifndef _ASM_M68K_TOPOLOGY_H | ||
| 2 | #define _ASM_M68K_TOPOLOGY_H | ||
| 3 | |||
| 4 | #include <asm-generic/topology.h> | ||
| 5 | |||
| 6 | #endif /* _ASM_M68K_TOPOLOGY_H */ | ||