X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fchar%2Frocket_int.h;h=55b8f2d71a9617d3be3c3d932b34002636d52afe;hb=9b73e76f3cf63379dcf45fcd4f112f5812418d0a;hp=b4c53dfa7951290f48be4b5e28e685d91a0b8558;hpb=ec4883b015c3212f6f6d04fb2ff45f528492f598;p=linux-2.6

diff --git a/drivers/char/rocket_int.h b/drivers/char/rocket_int.h
index b4c53dfa79..55b8f2d71a 100644
--- a/drivers/char/rocket_int.h
+++ b/drivers/char/rocket_int.h
@@ -1163,13 +1163,8 @@ struct r_port {
 	int read_status_mask;
 	int cps;
 
-#ifdef DECLARE_WAITQUEUE
 	wait_queue_head_t open_wait;
-	wait_queue_head_t close_wait;
-#else
-	struct wait_queue *open_wait;
-	struct wait_queue *close_wait;
-#endif
+	struct completion close_wait;
 	spinlock_t slock;
 	struct mutex write_mtx;
 };