diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-12 11:47:09 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-12 11:47:09 -0500 |
| commit | a2f0bb03f7c499e3db72c70a62b1aa5c55d6a82b (patch) | |
| tree | 761a00d15b20840e501f1825f1a48e1f21725cc5 /arch/avr32/include/asm | |
| parent | 41cbc01f6e49e48bc3d78158cec0a2d4ff6c906d (diff) | |
| parent | 89422ad6f894c03dee85a3cdb6b33cec3e0b805b (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32
Pull AVR32 update from Hans-Christian Egtvedt.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
avr32: update all default configurations
avr32: remove fake at91 cpu identification
avr32: wire up missing syscalls
Diffstat (limited to 'arch/avr32/include/asm')
| -rw-r--r-- | arch/avr32/include/asm/unistd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/include/asm/unistd.h b/arch/avr32/include/asm/unistd.h index c1eb080e45fe..2011bee3f252 100644 --- a/arch/avr32/include/asm/unistd.h +++ b/arch/avr32/include/asm/unistd.h | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | 10 | ||
| 11 | #include <uapi/asm/unistd.h> | 11 | #include <uapi/asm/unistd.h> |
| 12 | 12 | ||
| 13 | #define NR_syscalls 284 | 13 | #define NR_syscalls 321 |
| 14 | 14 | ||
| 15 | /* Old stuff */ | 15 | /* Old stuff */ |
| 16 | #define __IGNORE_uselib | 16 | #define __IGNORE_uselib |