diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-07 18:31:54 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-07 18:31:54 +0100 |
| commit | 673f8205914a12e928c65afbcd78ae748f78df53 (patch) | |
| tree | 38c60215646d079fab3bff812e094e914960c7ec /arch/m68k/include/asm/linkage.h | |
| parent | Btrfs: stop spinning on mutex_trylock and let the adaptive code spin for us (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable (diff) | |
| download | linux-673f8205914a12e928c65afbcd78ae748f78df53.tar.xz linux-673f8205914a12e928c65afbcd78ae748f78df53.zip | |
Merge branch 'linus' into core/locking
Conflicts:
fs/btrfs/locking.c
Diffstat (limited to 'arch/m68k/include/asm/linkage.h')
| -rw-r--r-- | arch/m68k/include/asm/linkage.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/linkage.h b/arch/m68k/include/asm/linkage.h new file mode 100644 index 000000000000..5a822bb790f7 --- /dev/null +++ b/arch/m68k/include/asm/linkage.h @@ -0,0 +1,7 @@ +#ifndef __ASM_LINKAGE_H +#define __ASM_LINKAGE_H + +#define __ALIGN .align 4 +#define __ALIGN_STR ".align 4" + +#endif |