diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-08 03:07:33 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-08 03:07:33 +0200 |
commit | 3d8cd0c5d75c424f986c0602dc26579fbb7c8080 (patch) | |
tree | 03c61f81542f6c34e32eb5e0dfc3d34668f88fdd /arch/m68knommu/include/asm/spinlock.h | |
parent | powerpc/iseries: remove the old viocons driver (diff) | |
parent | Move all of include/asm-m68knommu to arch/m68knommu/include/asm. (diff) | |
download | linux-3d8cd0c5d75c424f986c0602dc26579fbb7c8080.tar.xz linux-3d8cd0c5d75c424f986c0602dc26579fbb7c8080.zip |
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/spinlock.h')
-rw-r--r-- | arch/m68knommu/include/asm/spinlock.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m68knommu/include/asm/spinlock.h b/arch/m68knommu/include/asm/spinlock.h new file mode 100644 index 000000000000..6bb1f06c4781 --- /dev/null +++ b/arch/m68knommu/include/asm/spinlock.h @@ -0,0 +1 @@ +#include <asm-m68k/spinlock.h> |