aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-alpha
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-07-28 09:30:20 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-07-28 09:30:20 +0100
commit661299d9d0437a0ff72240f3d60016ac3a361a6e (patch)
tree765512576314fc3612b503f182b9ae4e60fcf849 /include/asm-alpha
parent05caac585f8abd6c0113856bc8858e3ef214d8a6 (diff)
parent41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff)
downloadkernel_samsung_smdk4412-661299d9d0437a0ff72240f3d60016ac3a361a6e.zip
kernel_samsung_smdk4412-661299d9d0437a0ff72240f3d60016ac3a361a6e.tar.gz
kernel_samsung_smdk4412-661299d9d0437a0ff72240f3d60016ac3a361a6e.tar.bz2
Merge with Linus' 2.6 tree
Diffstat (limited to 'include/asm-alpha')
-rw-r--r--include/asm-alpha/unistd.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/asm-alpha/unistd.h b/include/asm-alpha/unistd.h
index 535bc42..ef25b65 100644
--- a/include/asm-alpha/unistd.h
+++ b/include/asm-alpha/unistd.h
@@ -377,8 +377,13 @@
#define __NR_add_key 439
#define __NR_request_key 440
#define __NR_keyctl 441
+#define __NR_ioprio_set 442
+#define __NR_ioprio_get 443
+#define __NR_inotify_init 444
+#define __NR_inotify_add_watch 445
+#define __NR_inotify_rm_watch 446
-#define NR_SYSCALLS 442
+#define NR_SYSCALLS 447
#if defined(__GNUC__)