diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-16 00:16:07 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-16 00:16:07 +0200 |
| commit | 2502991560dc8244dbe10e48473d85722c1e2ec1 (patch) | |
| tree | 63b1f3be2ed56ff06f1e8db709e4ce85d69c3add /arch/x86/kernel/asm-offsets_64.c | |
| parent | Merge branch 's3c-move' into devel (diff) | |
| parent | [ARM] 5308/1: Fix Viper ISA IRQ handling (diff) | |
| download | linux-2502991560dc8244dbe10e48473d85722c1e2ec1.tar.xz linux-2502991560dc8244dbe10e48473d85722c1e2ec1.zip | |
Merge branch 'fixes' into for-linus
Conflicts:
arch/arm/mach-versatile/core.c
Diffstat (limited to 'arch/x86/kernel/asm-offsets_64.c')
| -rw-r--r-- | arch/x86/kernel/asm-offsets_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c index aa89387006fe..505543a75a56 100644 --- a/arch/x86/kernel/asm-offsets_64.c +++ b/arch/x86/kernel/asm-offsets_64.c @@ -22,7 +22,7 @@ #define __NO_STUBS 1 #undef __SYSCALL -#undef _ASM_X86_64_UNISTD_H_ +#undef ASM_X86__UNISTD_64_H #define __SYSCALL(nr, sym) [nr] = 1, static char syscalls[] = { #include <asm/unistd.h> |