diff options
author | David S. Miller <davem@davemloft.net> | 2011-09-16 09:09:02 +0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-09-16 09:09:02 +0400 |
commit | 52b9aca7ae8726d1fb41b97dd1d243d107fef11b (patch) | |
tree | 7acee111840bd25183513e9bde08e939ffd57be8 /include/linux/compat.h | |
parent | 7756332f5b64c9c1535712b9679792e8bd4f0019 (diff) | |
parent | e2faeec2de9e2c73958e6ea6065dde1e8cd6f3a2 (diff) | |
download | linux-52b9aca7ae8726d1fb41b97dd1d243d107fef11b.tar.xz |
Merge branch 'master' of ../netdev/
Diffstat (limited to 'include/linux/compat.h')
-rw-r--r-- | include/linux/compat.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/compat.h b/include/linux/compat.h index 8779405e15a8..c6e7523bf765 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -438,7 +438,6 @@ asmlinkage long compat_sys_ppoll(struct pollfd __user *ufds, struct compat_timespec __user *tsp, const compat_sigset_t __user *sigmask, compat_size_t sigsetsize); -asmlinkage long compat_sys_nfsservctl(int cmd, void *notused, void *notused2); asmlinkage long compat_sys_signalfd4(int ufd, const compat_sigset_t __user *sigmask, compat_size_t sigsetsize, int flags); |