diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 09:23:35 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 09:23:35 -0500 |
| commit | 3642a0a2c7d2d1949988d0fd004a8039c1f3d02f (patch) | |
| tree | e687c88b1b66ad51a6a6c529f7f328f2d3b625fa /arch/s390/include/asm/unistd.h | |
| parent | 58a273745fbb2fbd01d26e7a60f0acc8c1d99469 (diff) | |
| parent | b07fed455c883f07f8e847f5b0d79975b4dc8e7a (diff) | |
Merge branch 'mxs/saif' into next/drivers
Conflicts:
drivers/net/ethernet/cadence/Kconfig
Diffstat (limited to 'arch/s390/include/asm/unistd.h')
| -rw-r--r-- | arch/s390/include/asm/unistd.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/s390/include/asm/unistd.h b/arch/s390/include/asm/unistd.h index 404bdb9671b4..58de4c91c333 100644 --- a/arch/s390/include/asm/unistd.h +++ b/arch/s390/include/asm/unistd.h | |||
| @@ -277,7 +277,9 @@ | |||
| 277 | #define __NR_clock_adjtime 337 | 277 | #define __NR_clock_adjtime 337 |
| 278 | #define __NR_syncfs 338 | 278 | #define __NR_syncfs 338 |
| 279 | #define __NR_setns 339 | 279 | #define __NR_setns 339 |
| 280 | #define NR_syscalls 340 | 280 | #define __NR_process_vm_readv 340 |
| 281 | #define __NR_process_vm_writev 341 | ||
| 282 | #define NR_syscalls 342 | ||
| 281 | 283 | ||
| 282 | /* | 284 | /* |
| 283 | * There are some system calls that are not present on 64 bit, some | 285 | * There are some system calls that are not present on 64 bit, some |