Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[linux-2.6-microblaze.git] / drivers / tty / synclink_gt.c

diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
index 7e947ec..529c6e3 100644 (file)
--- a/drivers/tty/synclink_gt.c
+++ b/drivers/tty/synclink_gt.c
@@ -184,7 +184,7 @@ static void hdlcdev_exit(struct slgt_info *info);
 struct cond_wait {
        struct cond_wait *next;
        wait_queue_head_t q;
-       wait_queue_t wait;
+       wait_queue_entry_t wait;
        unsigned int data;
 };
 static void init_cond_wait(struct cond_wait *w, unsigned int data);