diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-09-16 16:40:38 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-09-16 16:40:38 +0200 |
| commit | 779608521976e3b8d264f89c67e64c918949cc9b (patch) | |
| tree | 12d604aa1a08b5bf556be11ee9c08b5b6b000179 /arch/parisc/include/uapi/asm/unistd.h | |
| parent | 7a9744cb455e6faa287e148394b4b422a6f3c5c4 (diff) | |
| parent | f7667af21736eb231e3589d9f91183d325cabfbe (diff) | |
Merge tag 'asoc-v3.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.17
This is mostly driver fixes, the biggest one being the tlv320aic31xx
which is relatively large but simple and device specific. There's a
small fix in the error handling in DPCM too which is relatively minor
error handling fix.
Diffstat (limited to 'arch/parisc/include/uapi/asm/unistd.h')
| -rw-r--r-- | arch/parisc/include/uapi/asm/unistd.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/parisc/include/uapi/asm/unistd.h b/arch/parisc/include/uapi/asm/unistd.h index 47e0e21d227..8667f18be23 100644 --- a/arch/parisc/include/uapi/asm/unistd.h +++ b/arch/parisc/include/uapi/asm/unistd.h @@ -830,8 +830,11 @@ #define __NR_sched_getattr (__NR_Linux + 335) #define __NR_utimes (__NR_Linux + 336) #define __NR_renameat2 (__NR_Linux + 337) +#define __NR_seccomp (__NR_Linux + 338) +#define __NR_getrandom (__NR_Linux + 339) +#define __NR_memfd_create (__NR_Linux + 340) -#define __NR_Linux_syscalls (__NR_renameat2 + 1) +#define __NR_Linux_syscalls (__NR_memfd_create + 1) #define __IGNORE_select /* newselect */ |