diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-03 23:09:33 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-03 23:09:33 +0100 |
| commit | f4ca536f71ad69d9a974d0156d43b24b3f3112de (patch) | |
| tree | 7361fc8dbcec4bdca9993890c06425f087fc5d7c /arch/m68k/include/asm/unistd.h | |
| parent | Merge tag 'armsoc-for-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/a... (diff) | |
| parent | m68k: Wire up bpf (diff) | |
| download | linux-f4ca536f71ad69d9a974d0156d43b24b3f3112de.tar.xz linux-f4ca536f71ad69d9a974d0156d43b24b3f3112de.zip | |
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 4ef7a54813e6..75e75d7b1702 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 |