diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2009-03-06 12:13:52 -0500 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-03-06 12:13:52 -0500 |
| commit | 1264fa6f8c5bf561a86128b2d48ace53e3f1e66f (patch) | |
| tree | 69872715982d49ddea5819040c7032062376183b /arch/powerpc/include/asm/seccomp.h | |
| parent | efeff568677aa325f84d3ce37c219019887a79eb (diff) | |
| parent | 559595a985e106d2fa9f0c79b7f5805453fed593 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c-fixes
Diffstat (limited to 'arch/powerpc/include/asm/seccomp.h')
| -rw-r--r-- | arch/powerpc/include/asm/seccomp.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/include/asm/seccomp.h b/arch/powerpc/include/asm/seccomp.h index 853765eb1f65..00c1d9133cfe 100644 --- a/arch/powerpc/include/asm/seccomp.h +++ b/arch/powerpc/include/asm/seccomp.h | |||
| @@ -1,10 +1,6 @@ | |||
| 1 | #ifndef _ASM_POWERPC_SECCOMP_H | 1 | #ifndef _ASM_POWERPC_SECCOMP_H |
| 2 | #define _ASM_POWERPC_SECCOMP_H | 2 | #define _ASM_POWERPC_SECCOMP_H |
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | ||
| 5 | #include <linux/thread_info.h> | ||
| 6 | #endif | ||
| 7 | |||
| 8 | #include <linux/unistd.h> | 4 | #include <linux/unistd.h> |
| 9 | 5 | ||
| 10 | #define __NR_seccomp_read __NR_read | 6 | #define __NR_seccomp_read __NR_read |