Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[linux-2.6] / include / asm-arm / linkage.h
1 #ifndef __ASM_LINKAGE_H
2 #define __ASM_LINKAGE_H
3
4 #define __ALIGN .align 0
5 #define __ALIGN_STR ".align 0"
6
7 #endif