diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-03 14:09:33 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-03 14:09:33 -0800 |
commit | f4ca536f71ad69d9a974d0156d43b24b3f3112de (patch) | |
tree | 7361fc8dbcec4bdca9993890c06425f087fc5d7c /arch/m68k/include/asm/unistd.h | |
parent | 2084becbe168f6d10be51e08a2eedb804cf51198 (diff) | |
parent | f7bbd12a4b7e088f53f20dd31019984459699fb9 (diff) | |
download | op-kernel-dev-f4ca536f71ad69d9a974d0156d43b24b3f3112de.zip op-kernel-dev-f4ca536f71ad69d9a974d0156d43b24b3f3112de.tar.gz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k update from Geert Uytterhoeven.
Just wiring up the bpf system call.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Wire up bpf
Diffstat (limited to 'arch/m68k/include/asm/unistd.h')
-rw-r--r-- | arch/m68k/include/asm/unistd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/unistd.h b/arch/m68k/include/asm/unistd.h index 4ef7a54..75e75d7 100644 --- a/arch/m68k/include/asm/unistd.h +++ b/arch/m68k/include/asm/unistd.h @@ -4,7 +4,7 @@ #include <uapi/asm/unistd.h> -#define NR_syscalls 354 +#define NR_syscalls 355 #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_OLD_STAT |