From 19b8839635fab906e35a0b4cb90a706d818dfce4 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Sat, 13 Oct 2007 23:56:32 +0200
Subject: [PATCH] --- yaml --- r: 68595 b: refs/heads/master c:
 cdeec3cc79c7b1acfa89fb362b01e544ecfb285c h: refs/heads/master i:   68593:
 3c7a32a2154a4f001bf077877962b82c8c12fab5   68591:
 e0c6b86a896cb1a774c082be55862645fbea9bcc v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/video/cx23885/cx23885-i2c.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 8b9e363b963b..ead6238582a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3be27d37c257fa5f99363f9c8e06e405cbad712e
+refs/heads/master: cdeec3cc79c7b1acfa89fb362b01e544ecfb285c
diff --git a/trunk/drivers/media/video/cx23885/cx23885-i2c.c b/trunk/drivers/media/video/cx23885/cx23885-i2c.c
index b517c8b5a566..71da528932df 100644
--- a/trunk/drivers/media/video/cx23885/cx23885-i2c.c
+++ b/trunk/drivers/media/video/cx23885/cx23885-i2c.c
@@ -272,12 +272,6 @@ void cx23885_call_i2c_clients(struct cx23885_i2c *bus,
 	i2c_clients_command(&bus->i2c_adap, cmd, arg);
 }
 
-static int cx23885_algo_control(struct i2c_adapter *adap,
-				unsigned int cmd, unsigned long arg)
-{
-	return 0;
-}
-
 static u32 cx23885_functionality(struct i2c_adapter *adap)
 {
 	return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_I2C;
@@ -285,7 +279,6 @@ static u32 cx23885_functionality(struct i2c_adapter *adap)
 
 static struct i2c_algorithm cx23885_i2c_algo_template = {
 	.master_xfer	= i2c_xfer,
-	.algo_control	= cx23885_algo_control,
 	.functionality	= cx23885_functionality,
 };