Commit c9700b7e authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] remove kernel 2.2 #ifdef's from {i,}stallion.h

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

The patch below removeskernel 2.2 #ifdef's from {i,}stallion.h .
parent 32856f32
...@@ -70,15 +70,9 @@ typedef struct { ...@@ -70,15 +70,9 @@ typedef struct {
void *argp; void *argp;
unsigned int rxmarkmsk; unsigned int rxmarkmsk;
struct tty_struct *tty; struct tty_struct *tty;
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0))
struct wait_queue *open_wait;
struct wait_queue *close_wait;
struct wait_queue *raw_wait;
#else
wait_queue_head_t open_wait; wait_queue_head_t open_wait;
wait_queue_head_t close_wait; wait_queue_head_t close_wait;
wait_queue_head_t raw_wait; wait_queue_head_t raw_wait;
#endif
struct work_struct tqhangup; struct work_struct tqhangup;
asysigs_t asig; asysigs_t asig;
unsigned long addr; unsigned long addr;
......
...@@ -95,13 +95,8 @@ typedef struct stlport { ...@@ -95,13 +95,8 @@ typedef struct stlport {
unsigned long hwid; unsigned long hwid;
void *uartp; void *uartp;
struct tty_struct *tty; struct tty_struct *tty;
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0))
struct wait_queue *open_wait;
struct wait_queue *close_wait;
#else
wait_queue_head_t open_wait; wait_queue_head_t open_wait;
wait_queue_head_t close_wait; wait_queue_head_t close_wait;
#endif
struct work_struct tqueue; struct work_struct tqueue;
comstats_t stats; comstats_t stats;
stlrq_t tx; stlrq_t tx;
......
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