---

yaml --- r: 164173 b: refs/heads/master c: c923045 h: refs/heads/master i: 164171: 2ec6a17 v: v3
git-mirror · Sep 19, 2009 · 1186191 · 1186191
1 parent b405983
commit 1186191
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b501de58bf4cd16563d1acec43a11c7cd1517fe
+refs/heads/master: c9230457a98f33fe3658fd0bd9b9ceffdd97b63b
diff --git a/trunk/drivers/media/video/saa7164/saa7164-i2c.c b/trunk/drivers/media/video/saa7164/saa7164-i2c.c
@@ -116,7 +116,6 @@ static struct i2c_algorithm saa7164_i2c_algo_template = {
 static struct i2c_adapter saa7164_i2c_adap_template = {
 	.name              = "saa7164",
 	.owner             = THIS_MODULE,
-	.id                = I2C_HW_B_SAA7164,
 	.algo              = &saa7164_i2c_algo_template,
 	.client_register   = attach_inform,
 	.client_unregister = detach_inform,

diff --git a/trunk/include/linux/i2c-id.h b/trunk/include/linux/i2c-id.h
@@ -53,7 +53,6 @@
 #define I2C_HW_B_AU0828		0x010023 /* auvitek au0828 usb bridge */
 #define I2C_HW_B_CX231XX	0x010024 /* Conexant CX231XX USB based cards */
 #define I2C_HW_B_HDPVR		0x010025 /* Hauppauge HD PVR */
-#define I2C_HW_B_SAA7164        0x010024 /* NXP 7164 based tv cards */
 
 /* --- SGI adapters							*/
 #define I2C_HW_SGI_VINO		0x160000