Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / fs / cachefiles / namei.c

diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
index 41df8a2..3978b32 100644 (file)
--- a/fs/cachefiles/namei.c
+++ b/fs/cachefiles/namei.c
@@ -204,7 +204,7 @@ wait_for_old_object:
                wait_queue_head_t *wq;
 
                signed long timeout = 60 * HZ;
-               wait_queue_t wait;
+               wait_queue_entry_t wait;
                bool requeue;
 
                /* if the object we're waiting for is queued for processing,