diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-27 12:01:51 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-27 12:01:51 +0100 |
| commit | 3ddeb51d9c83931c1ca6abf76a38934c5a1ed918 (patch) | |
| tree | fc2efb59d627135ea2199a8a68415b162646b121 /arch/m68k/include/asm/auxvec.h | |
| parent | generic, x86: fix __per_cpu_load relocation (diff) | |
| parent | Fix "multiple definition of `debugfs_create_size_t'" (diff) | |
| download | linux-3ddeb51d9c83931c1ca6abf76a38934c5a1ed918.tar.xz linux-3ddeb51d9c83931c1ca6abf76a38934c5a1ed918.zip | |
Merge branch 'linus' into core/percpu
Conflicts:
arch/x86/kernel/setup_percpu.c
Diffstat (limited to 'arch/m68k/include/asm/auxvec.h')
| -rw-r--r-- | arch/m68k/include/asm/auxvec.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/auxvec.h b/arch/m68k/include/asm/auxvec.h new file mode 100644 index 000000000000..844d6d52204b --- /dev/null +++ b/arch/m68k/include/asm/auxvec.h @@ -0,0 +1,4 @@ +#ifndef __ASMm68k_AUXVEC_H +#define __ASMm68k_AUXVEC_H + +#endif |