diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-27 11:12:20 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-27 11:12:20 -0500 |
| commit | 562e74fefc36eb57286455c68a60f2776659a7e1 (patch) | |
| tree | 1eeaeb09bc06ca65aad5e0c8882caab2bdcf1e90 /arch/cris/include/asm | |
| parent | 77d143de75812596a58d126606f42d1214e09dde (diff) | |
| parent | e269a869417cd4053b37da1b19186902d3cbf63b (diff) | |
Merge tag 'cris-for-3.14' of git://jni.nu/cris
Pull cris changes from Jesper Nilsson:
"Mostly removal of deprecated or old code, but also a long promised
update of the CRIS syscalls"
* tag 'cris-for-3.14' of git://jni.nu/cris:
Drop code for CRISv10 CPU simulator
Cleanup whitespace, remove old author tag
CRIS: Add missing syscalls
cris: sync_serial: remove interruptible_sleep_on
cris: remove deprecated IRQF_DISABLED
Diffstat (limited to 'arch/cris/include/asm')
| -rw-r--r-- | arch/cris/include/asm/unistd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/include/asm/unistd.h b/arch/cris/include/asm/unistd.h index 0ff3f6889842..5cc7d1991e48 100644 --- a/arch/cris/include/asm/unistd.h +++ b/arch/cris/include/asm/unistd.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | #include <uapi/asm/unistd.h> | 4 | #include <uapi/asm/unistd.h> |
| 5 | 5 | ||
| 6 | 6 | ||
| 7 | #define NR_syscalls 336 | 7 | #define NR_syscalls 360 |
| 8 | 8 | ||
| 9 | #include <arch/unistd.h> | 9 | #include <arch/unistd.h> |
| 10 | 10 | ||