diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 11:53:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 11:53:26 -0400 |
commit | 65fc471343acbab05e2e24ad9688af43a37d6a1b (patch) | |
tree | 9911274b04db7f248405c579ce2231dc57aa4776 /arch/sparc64/kernel/sys_sparc32.c | |
parent | ccaa36f73544163ef6e15eb29a620130755f6001 (diff) | |
parent | 94e45a2b87bde64fd2eb170999da2fd2c5b04d28 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Update defconfig.
[SPARC64]: Do not include compat.h from asm-sparc64/signal.h any more.
[SPARC64]: Move signal compat bits to new header file.
Diffstat (limited to 'arch/sparc64/kernel/sys_sparc32.c')
-rw-r--r-- | arch/sparc64/kernel/sys_sparc32.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c index dbc6d1a3be1f..e27cb71bd8e2 100644 --- a/arch/sparc64/kernel/sys_sparc32.c +++ b/arch/sparc64/kernel/sys_sparc32.c | |||
@@ -61,6 +61,7 @@ | |||
61 | #include <asm/semaphore.h> | 61 | #include <asm/semaphore.h> |
62 | #include <asm/mmu_context.h> | 62 | #include <asm/mmu_context.h> |
63 | #include <asm/a.out.h> | 63 | #include <asm/a.out.h> |
64 | #include <asm/compat_signal.h> | ||
64 | 65 | ||
65 | asmlinkage long sys32_chown16(const char __user * filename, u16 user, u16 group) | 66 | asmlinkage long sys32_chown16(const char __user * filename, u16 user, u16 group) |
66 | { | 67 | { |