Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc

[linux-2.6-omap-h63xx.git] / include / asm-avr32 / unistd.h

diff --git a/include/asm-avr32/unistd.h b/include/asm-avr32/unistd.h
index a50e5004550c5d506d23b33db1a5bea490d50e84..56ed1f9d348a55f1ad3e534310a63359ec66dc58 100644 (file)
--- 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