git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
fs
/
compat.c
diff --git
a/fs/compat.c
b/fs/compat.c
index
0644a15
..
f03abda
100644
(file)
--- a/
fs/compat.c
+++ b/
fs/compat.c
@@
-1963,7
+1963,7
@@
asmlinkage long compat_sys_ppoll(struct pollfd __user *ufds,
}
#endif /* HAVE_SET_RESTORE_SIGMASK */
}
#endif /* HAVE_SET_RESTORE_SIGMASK */
-#if
defined(CONFIG_NFSD) || defined(CONFIG_NFSD_MODULE
)
+#if
(defined(CONFIG_NFSD) || defined(CONFIG_NFSD_MODULE)) && !defined(CONFIG_NFSD_DEPRECATED
)
/* Stuff for NFS server syscalls... */
struct compat_nfsctl_svc {
u16 svc32_port;
/* Stuff for NFS server syscalls... */
struct compat_nfsctl_svc {
u16 svc32_port;