Merge commit 'v2.6.29-rc1' into perfcounters/core

[mv-sheeva.git] / include / linux / syscalls.h

diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index a549678b7c3c51697d340ebc7bd5689fdac4f62d..a1d177ce0a08edf101bc26e27416b6102cec43ef 100644 (file)
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -550,7 +550,7 @@ asmlinkage long sys_inotify_init(void);
 asmlinkage long sys_inotify_init1(int flags);
 asmlinkage long sys_inotify_add_watch(int fd, const char __user *path,
                                        u32 mask);
-asmlinkage long sys_inotify_rm_watch(int fd, u32 wd);
+asmlinkage long sys_inotify_rm_watch(int fd, __s32 wd);
 
 asmlinkage long sys_spu_run(int fd, __u32 __user *unpc,
                                 __u32 __user *ustatus);