aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-ia64
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-ia64
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-ia64')
-rw-r--r--include/asm-ia64/unistd.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h
index 517f164..3a0c695 100644
--- a/include/asm-ia64/unistd.h
+++ b/include/asm-ia64/unistd.h
@@ -266,6 +266,9 @@
#define __NR_ioprio_set 1274
#define __NR_ioprio_get 1275
#define __NR_set_zone_reclaim 1276
+#define __NR_inotify_init 1277
+#define __NR_inotify_add_watch 1278
+#define __NR_inotify_rm_watch 1279
#ifdef __KERNEL__