git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
telephony
/
ixj.h
diff --git
a/drivers/telephony/ixj.h
b/drivers/telephony/ixj.h
index
aa51222
..
65d837d
100644
(file)
--- a/
drivers/telephony/ixj.h
+++ b/
drivers/telephony/ixj.h
@@
-1198,22
+1198,13
@@
typedef struct {
int aec_level;
int cid_play_aec_level;
int readers, writers;
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;
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;
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;
wait_queue_head_t write_q;
-#endif
char *write_buffer, *write_buffer_end;
char *write_convert_buffer;
size_t write_buffer_size;
char *write_buffer, *write_buffer_end;
char *write_convert_buffer;
size_t write_buffer_size;