---

yaml --- r: 320643 b: refs/heads/master c: b26f453 h: refs/heads/master i: 320641: b64a686 320639: 4eae4a9 v: v3
git-mirror · Jul 30, 2012 · d42bb3b · d42bb3b
1 parent 2337b02
commit d42bb3b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 272863540371cd86a7f05d6fef7db7868ea79a2e
+refs/heads/master: b26f453963a5275a5c408beee7663d5bc096620f
diff --git a/trunk/drivers/media/video/cx25821/cx25821-i2c.c b/trunk/drivers/media/video/cx25821/cx25821-i2c.c
@@ -307,16 +307,13 @@ int cx25821_i2c_register(struct cx25821_i2c *bus)
 
 	memcpy(&bus->i2c_adap, &cx25821_i2c_adap_template,
 	       sizeof(bus->i2c_adap));
-	memcpy(&bus->i2c_algo, &cx25821_i2c_algo_template,
-	       sizeof(bus->i2c_algo));
 	memcpy(&bus->i2c_client, &cx25821_i2c_client_template,
 	       sizeof(bus->i2c_client));
 
 	bus->i2c_adap.dev.parent = &dev->pci->dev;
 
 	strlcpy(bus->i2c_adap.name, bus->dev->name, sizeof(bus->i2c_adap.name));
 
-	bus->i2c_algo.data = bus;
 	bus->i2c_adap.algo_data = bus;
 	i2c_set_adapdata(&bus->i2c_adap, &dev->v4l2_dev);
 	i2c_add_adapter(&bus->i2c_adap);

diff --git a/trunk/drivers/media/video/cx25821/cx25821.h b/trunk/drivers/media/video/cx25821/cx25821.h
@@ -26,7 +26,6 @@
 
 #include <linux/pci.h>
 #include <linux/i2c.h>
-#include <linux/i2c-algo-bit.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/sched.h>
@@ -213,7 +212,6 @@ struct cx25821_i2c {
 
 	/* i2c i/o */
 	struct i2c_adapter i2c_adap;
-	struct i2c_algo_bit_data i2c_algo;
 	struct i2c_client i2c_client;
 	u32 i2c_rc;