summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-11-06 09:07:19 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-11-06 09:07:19 -0800
commitb7651030a56b9aa80e9cb43b4c8bb28b89c42359 (patch)
tree62a8be1eb24b8ca032ae7c361347d4ff1deb6a59 /include
parentbee42f626e2fee83cb7b51be9dc658c4f4046e77 (diff)
parent6af0f5f83169ef215b4579834ddfb2691e8a7bff (diff)
downloadop-kernel-dev-b7651030a56b9aa80e9cb43b4c8bb28b89c42359.zip
op-kernel-dev-b7651030a56b9aa80e9cb43b4c8bb28b89c42359.tar.gz
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: Add missing return instruction in __raw_writesb AVR32: Wire up sys_epoll_pwait AVR32: Fix thinko in generic_find_next_zero_le_bit() AVR32: Get rid of board_early_init
Diffstat (limited to 'include')
-rw-r--r--include/asm-avr32/unistd.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-avr32/unistd.h b/include/asm-avr32/unistd.h
index a50e500..56ed1f9 100644
--- a/include/asm-avr32/unistd.h
+++ b/include/asm-avr32/unistd.h
@@ -280,9 +280,10 @@
#define __NR_sync_file_range 262
#define __NR_tee 263
#define __NR_vmsplice 264
+#define __NR_epoll_pwait 265
#ifdef __KERNEL__
-#define NR_syscalls 265
+#define NR_syscalls 266
#define __ARCH_WANT_IPC_PARSE_VERSION
OpenPOWER on IntegriCloud