patch-2.4.25 linux-2.4.25/drivers/i2c/i2c-adap-ite.c

Next file: linux-2.4.25/drivers/i2c/i2c-algo-bit.c
Previous file: linux-2.4.25/drivers/i2c/Makefile
Back to the patch index
Back to the overall index

diff -urN linux-2.4.24/drivers/i2c/i2c-adap-ite.c linux-2.4.25/drivers/i2c/i2c-adap-ite.c
@@ -38,7 +38,6 @@
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
-#include <linux/version.h>
 #include <linux/init.h>
 #include <asm/irq.h>
 #include <asm/io.h>
@@ -61,11 +60,7 @@
 
 static int i2c_debug=0;
 static struct iic_ite gpi;
-#if (LINUX_VERSION_CODE < 0x020301)
-static struct wait_queue *iic_wait = NULL;
-#else
 static wait_queue_head_t iic_wait;
-#endif
 static int iic_pending;
 
 /* ----- global defines -----------------------------------------------	*/
@@ -271,9 +266,6 @@
 		piic->iic_own = own;
 
 	iic_ite_data.data = (void *)piic;
-#if (LINUX_VERSION_CODE >= 0x020301)
-	init_waitqueue_head(&iic_wait);
-#endif
 	if (iic_hw_resrc_init() == 0) {
 		if (i2c_iic_add_bus(&iic_ite_ops) < 0)
 			return -ENODEV;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)