Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge
[linux-2.6] / arch / m68k / include / asm / linkage.h
1 #ifndef __ASM_LINKAGE_H
2 #define __ASM_LINKAGE_H
3
4 #define __ALIGN .align 4
5 #define __ALIGN_STR ".align 4"
6
7 #endif