summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-28 01:37:03 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-28 01:37:03 +0200
commit96fad28a781069eb40156f78b8f50c349805b652 (patch)
tree0d428a842ac643176921fcf44e1728ea6ff88690 /include
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm-smp (diff)
parent[IA64] unwind.c uses wrong unat from switch_stack (diff)
downloadlinux-96fad28a781069eb40156f78b8f50c349805b652.tar.xz
linux-96fad28a781069eb40156f78b8f50c349805b652.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'include')
-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 517f1649ee64..3a0c69524656 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__