2 files changed, 0 insertions, 12 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index cf56b10d9..cbf848e82 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -3120,9 +3120,6 @@ static int pvr2_send_request_ex(struct pvr2_hdw *hdw,
 				  write_len,
 				  pvr2_ctl_write_complete,
 				  hdw);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
-		hdw->ctl_write_urb->transfer_flags |= URB_ASYNC_UNLINK;
-#endif
 		hdw->ctl_write_urb->actual_length = 0;
 		hdw->ctl_write_pend_flag = !0;
 		status = usb_submit_urb(hdw->ctl_write_urb,GFP_KERNEL);
@@ -3147,9 +3144,6 @@ static int pvr2_send_request_ex(struct pvr2_hdw *hdw,
 				  read_len,
 				  pvr2_ctl_read_complete,
 				  hdw);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
-		hdw->ctl_read_urb->transfer_flags |= URB_ASYNC_UNLINK;
-#endif
 		hdw->ctl_read_urb->actual_length = 0;
 		hdw->ctl_read_pend_flag = !0;
 		status = usb_submit_urb(hdw->ctl_read_urb,GFP_KERNEL);
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
index 362ec49f5..797017066 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
@@ -1017,9 +1017,6 @@ static int pvr2_i2c_detach_inform(struct i2c_client *client)
 }
 
 static struct i2c_algorithm pvr2_i2c_algo_template = {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
-	.id            = I2C_HW_B_BT848,
-#endif
 	.master_xfer   = pvr2_i2c_xfer,
 	.functionality = pvr2_i2c_functionality,
 };
@@ -1081,9 +1078,6 @@ void pvr2_i2c_core_init(struct pvr2_hdw *hdw)
 	memcpy(&hdw->i2c_algo,&pvr2_i2c_algo_template,sizeof(hdw->i2c_algo));
 	strlcpy(hdw->i2c_adap.name,hdw->name,sizeof(hdw->i2c_adap.name));
 	hdw->i2c_adap.dev.parent = &hdw->usb_dev->dev;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
-	strlcpy(hdw->i2c_algo.name,hdw->name,sizeof(hdw->i2c_algo.name));
-#endif
 	hdw->i2c_adap.algo = &hdw->i2c_algo;
 	hdw->i2c_adap.algo_data = hdw;
 	hdw->i2c_pend_mask = 0;