
From: Adrian Bunk <bunk@fs.tum.de>

The patch below removes two #ifdef's for kernel 2.2 from
linux-2.6.2-mm1/drivers/telephony/ixj.h


---

 25-akpm/drivers/telephony/ixj.h |    9 ---------
 1 files changed, 9 deletions(-)

diff -puN drivers/telephony/ixj.h~telephony-ixjh-remove-kernel-22-ifdefs-fwd drivers/telephony/ixj.h
--- 25/drivers/telephony/ixj.h~telephony-ixjh-remove-kernel-22-ifdefs-fwd	2004-05-08 22:09:55.274196016 -0700
+++ 25-akpm/drivers/telephony/ixj.h	2004-05-08 22:09:55.277195560 -0700
@@ -1198,22 +1198,13 @@ typedef struct {
 	int aec_level;
 	int cid_play_aec_level;
 	int readers, writers;
-#if LINUX_VERSION_CODE < 0x020400
-	struct wait_queue *poll_q;
-	struct wait_queue *read_q;
-#else
         wait_queue_head_t poll_q;
         wait_queue_head_t read_q;
-#endif
 	char *read_buffer, *read_buffer_end;
 	char *read_convert_buffer;
 	size_t read_buffer_size;
 	unsigned int read_buffer_ready;
-#if LINUX_VERSION_CODE < 0x020400
-	struct wait_queue *write_q;
-#else
         wait_queue_head_t write_q;
-#endif
 	char *write_buffer, *write_buffer_end;
 	char *write_convert_buffer;
 	size_t write_buffer_size;

_
