From ba6b21473fbf0fb842e9fa3af71e181b7e64124f Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sat, 22 Dec 2007 18:28:22 -0300 Subject: [PATCH] --- yaml --- r: 76663 b: refs/heads/master c: d998cc6a6d8e7da19ecadded55e373a84b1b4463 h: refs/heads/master i: 76661: d33ae27e04002cb25769e7b33731274aa6879708 76659: 225d053484356b3ba119187e43f4b0385c7fe45e 76655: ef4eebf5c7bcb05563625ee2795fcb7e813e40d4 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/ivtv/ivtv-i2c.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index dbe8b865d3b1..7daa0c4f1688 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9134be0376e7527afa4f2574253ff02ca80d5b47 +refs/heads/master: d998cc6a6d8e7da19ecadded55e373a84b1b4463 diff --git a/trunk/drivers/media/video/ivtv/ivtv-i2c.c b/trunk/drivers/media/video/ivtv/ivtv-i2c.c index efd4a1324dc5..fa5ab1eb1800 100644 --- a/trunk/drivers/media/video/ivtv/ivtv-i2c.c +++ b/trunk/drivers/media/video/ivtv/ivtv-i2c.c @@ -580,7 +580,7 @@ static int ivtv_getsda_old(void *data) /* template for i2c-bit-algo */ static struct i2c_adapter ivtv_i2c_adap_template = { .name = "ivtv i2c driver", - .id = I2C_HW_B_CX2341X, /* algo-bit is OR'd with this */ + .id = I2C_HW_B_CX2341X, .algo = NULL, /* set by i2c-algo-bit */ .algo_data = NULL, /* filled from template */ .client_register = attach_inform,