From: Jiri Slaby <jslaby@suse.cz>
Date: Mon, 5 Mar 2012 13:52:00 +0000 (+0100)
Subject: TTY: serialP, remove DECLARE_WAITQUEUE check
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=44a1bfd95d0a6c0096e79a883197596e1ce83cc3;p=~shefty%2Frdma-dev.git

TTY: serialP, remove DECLARE_WAITQUEUE check

The macro is always defined now. This was there only for historical
reasons.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/include/linux/serialP.h b/include/linux/serialP.h
index e811a615f69..ec27b34bbbd 100644
--- a/include/linux/serialP.h
+++ b/include/linux/serialP.h
@@ -79,15 +79,9 @@ struct async_struct {
 	int			io_type;
 	struct work_struct			work;
 	struct tasklet_struct	tlet;
-#ifdef DECLARE_WAITQUEUE
 	wait_queue_head_t	open_wait;
 	wait_queue_head_t	close_wait;
 	wait_queue_head_t	delta_msr_wait;
-#else	
-	struct wait_queue	*open_wait;
-	struct wait_queue	*close_wait;
-	struct wait_queue	*delta_msr_wait;
-#endif	
 	struct async_struct	*next_port; /* For the linked list */
 	struct async_struct	*prev_port;
 };