Merge branch 'linux-2.6'

1 files changed, 8 insertions, 3 deletions

diff --git a/include/asm-alpha/unistd.h b/include/asm-alpha/unistd.h
index 84313d14e780..e58a427012dd 100644
--- a/include/asm-alpha/unistd.h
+++ b/include/asm-alpha/unistd.h
@@ -342,9 +342,14 @@
 #define __NR_io_cancel                  402
 #define __NR_exit_group                 405
 #define __NR_lookup_dcookie             406
-#define __NR_sys_epoll_create           407
-#define __NR_sys_epoll_ctl              408
-#define __NR_sys_epoll_wait             409
+#define __NR_epoll_create               407
+#define __NR_epoll_ctl                  408
+#define __NR_epoll_wait                 409
+/* Feb 2007: These three sys_epoll defines shouldn't be here but culling
+ * them would break userspace apps ... we'll kill them off in 2010 :) */
+#define __NR_sys_epoll_create           __NR_epoll_create
+#define __NR_sys_epoll_ctl              __NR_epoll_ctl
+#define __NR_sys_epoll_wait             __NR_epoll_wait
 #define __NR_remap_file_pages           410
 #define __NR_set_tid_address            411
 #define __NR_restart_syscall            412