diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 21:50:25 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 21:50:25 +0200 |
| commit | 3960208f9ca0cf6bdb31c21c59ac0526303f8b34 (patch) | |
| tree | ca1948cec8fb390e5298498361194db145e2e49f /include/asm-avr32/unistd.h | |
| parent | i386: msr.h: be paranoid about types and parentheses (diff) | |
| parent | [AVR32] Wire up sys_utimensat (diff) | |
| download | linux-3960208f9ca0cf6bdb31c21c59ac0526303f8b34.tar.xz linux-3960208f9ca0cf6bdb31c21c59ac0526303f8b34.zip | |
Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32
* 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32:
[AVR32] Wire up sys_utimensat
[AVR32] Fix section mismatch .taglist -> .init.text
[AVR32] Implement dma_{alloc,free}_writecombine()
AVR32: Spinlock initializer cleanup
[AVR32] Use correct config symbol when setting cpuflags
Diffstat (limited to 'include/asm-avr32/unistd.h')
| -rw-r--r-- | include/asm-avr32/unistd.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-avr32/unistd.h b/include/asm-avr32/unistd.h index 8f5120471819..2418cce624cc 100644 --- a/include/asm-avr32/unistd.h +++ b/include/asm-avr32/unistd.h @@ -295,8 +295,10 @@ #define __NR_shmdt 276 #define __NR_shmctl 277 +#define __NR_utimensat 278 + #ifdef __KERNEL__ -#define NR_syscalls 278 +#define NR_syscalls 279 #define __ARCH_WANT_IPC_PARSE_VERSION |