Commit 8b1d1b1c authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] telephony/ixj.h: remove kernel 2.2 #ifdef's

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
parent 8b2e10d7
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment