diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-09-06 18:47:31 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-09-06 18:47:31 -0400 |
| commit | c08319a9d50b5c9cb4fdb33728bd16497cf4ddd3 (patch) | |
| tree | 5fbec9030029da1ec387c18b85f26f19ee50da44 /drivers/media/video/adv7175.c | |
| parent | bfa0d75a1eee59f0577e3c1697ff570b77581a35 (diff) | |
| parent | 4706df3d3c42af802597d82c8b1542c3d52eab23 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/media/video/adv7175.c')
| -rw-r--r-- | drivers/media/video/adv7175.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c index f898b6586374..b5ed9544bdea 100644 --- a/drivers/media/video/adv7175.c +++ b/drivers/media/video/adv7175.c | |||
| @@ -441,7 +441,6 @@ static struct i2c_client_address_data addr_data = { | |||
| 441 | .normal_i2c = normal_i2c, | 441 | .normal_i2c = normal_i2c, |
| 442 | .probe = &ignore, | 442 | .probe = &ignore, |
| 443 | .ignore = &ignore, | 443 | .ignore = &ignore, |
| 444 | .force = &ignore, | ||
| 445 | }; | 444 | }; |
| 446 | 445 | ||
| 447 | static struct i2c_driver i2c_driver_adv7175; | 446 | static struct i2c_driver i2c_driver_adv7175; |