diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-11 17:10:07 +1100 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-11 17:10:07 +1100 |
commit | e14eee56c2280953c6e3d24d5dce42bd90836b81 (patch) | |
tree | 21ab792d9ad6fbbab460058f352a0158f995644e /arch/mips/include/asm/seccomp.h | |
parent | d6ee6f7e4c74d9a0fed7544f4d389bde004651d3 (diff) | |
parent | 99adcd9d67aaf04e28f5ae96df280f236bde4b66 (diff) | |
download | kernel-crypto-e14eee56c2280953c6e3d24d5dce42bd90836b81.tar.gz kernel-crypto-e14eee56c2280953c6e3d24d5dce42bd90836b81.tar.xz kernel-crypto-e14eee56c2280953c6e3d24d5dce42bd90836b81.zip |
Merge commit 'origin/master' into next
Diffstat (limited to 'arch/mips/include/asm/seccomp.h')
-rw-r--r-- | arch/mips/include/asm/seccomp.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/include/asm/seccomp.h b/arch/mips/include/asm/seccomp.h index 36ed4407025..a6772e9507f 100644 --- a/arch/mips/include/asm/seccomp.h +++ b/arch/mips/include/asm/seccomp.h @@ -1,6 +1,5 @@ #ifndef __ASM_SECCOMP_H -#include <linux/thread_info.h> #include <linux/unistd.h> #define __NR_seccomp_read __NR_read |