diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 03:31:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 03:31:02 -0400 |
| commit | 8566cfc9fe0934f52ddedc12b083176116c13978 (patch) | |
| tree | b0f92fd0982a4dabaa2c108f4f1d130d2cff6798 /drivers/media/video/saa7110.c | |
| parent | 7bdb2b6aca356c765bb697a4e9e7599357ee1542 (diff) | |
| parent | 77ae84554cc0178e03862391599a0cedf96fa4c4 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Diffstat (limited to 'drivers/media/video/saa7110.c')
| -rw-r--r-- | drivers/media/video/saa7110.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c index 22d055d8a695..e116bdbed310 100644 --- a/drivers/media/video/saa7110.c +++ b/drivers/media/video/saa7110.c | |||
| @@ -470,7 +470,6 @@ static struct i2c_client_address_data addr_data = { | |||
| 470 | .normal_i2c = normal_i2c, | 470 | .normal_i2c = normal_i2c, |
| 471 | .probe = &ignore, | 471 | .probe = &ignore, |
| 472 | .ignore = &ignore, | 472 | .ignore = &ignore, |
| 473 | .force = &ignore, | ||
| 474 | }; | 473 | }; |
| 475 | 474 | ||
| 476 | static struct i2c_driver i2c_driver_saa7110; | 475 | static struct i2c_driver i2c_driver_saa7110; |