From fa9842722e349c6c9c3e83ad30de01f7e103682b Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Fri, 12 Nov 2010 09:23:04 -0500
Subject: [PATCH] --- yaml --- r: 222179 b: refs/heads/master c:
 5685b971362651ee3d99ff3cc512c3bbd049d34d h: refs/heads/master i:   222177:
 3483b771c9906065b92f335c643bc71ff5dc3587   222175:
 0cf310e4440dbe9a6bc19262f1fa9cb56a0a5179 v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/nfs_fs.h | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index a06877c97233..f7b4f683fb4a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac39612824e1fad8baf82c2841e42b2142af3445
+refs/heads/master: 5685b971362651ee3d99ff3cc512c3bbd049d34d
diff --git a/trunk/include/linux/nfs_fs.h b/trunk/include/linux/nfs_fs.h
index bba26684acdc..c66fdb7d6998 100644
--- a/trunk/include/linux/nfs_fs.h
+++ b/trunk/include/linux/nfs_fs.h
@@ -593,12 +593,6 @@ nfs_fileid_to_ino_t(u64 fileid)
 	return ino;
 }
 
-#define nfs_wait_event(clnt, wq, condition)				\
-({									\
-	int __retval = wait_event_killable(wq, condition);		\
-	__retval;							\
-})
-
 #define NFS_JUKEBOX_RETRY_TIME (5 * HZ)
 
 #endif /* __KERNEL__ */