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

From: Adrian Bunk
Date: Sat Feb 07 2004 - 15:42:27 EST


The patch below removeskernel 2.2 #ifdef's from {i,}stallion.h .

Please apply
Adrian

--- linux-2.6.2-mm1/include/linux/istallion.h.old 2004-02-07 21:35:58.000000000 +0100
+++ linux-2.6.2-mm1/include/linux/istallion.h 2004-02-07 21:36:12.000000000 +0100
@@ -70,15 +70,9 @@
void *argp;
unsigned int rxmarkmsk;
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 close_wait;
wait_queue_head_t raw_wait;
-#endif
struct work_struct tqhangup;
asysigs_t asig;
unsigned long addr;
--- linux-2.6.2-mm1/include/linux/stallion.h.old 2004-02-07 21:36:33.000000000 +0100
+++ linux-2.6.2-mm1/include/linux/stallion.h 2004-02-07 21:36:46.000000000 +0100
@@ -95,13 +95,8 @@
unsigned long hwid;
void *uartp;
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 close_wait;
-#endif
struct work_struct tqueue;
comstats_t stats;
stlrq_t tx;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/