diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/video/ivtv/ivtv-i2c.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/media/video/ivtv/ivtv-i2c.c b/drivers/media/video/ivtv/ivtv-i2c.c index 5e12ebc2a9de..085dc3938da7 100644 --- a/drivers/media/video/ivtv/ivtv-i2c.c +++ b/drivers/media/video/ivtv/ivtv-i2c.c | |||
| @@ -536,14 +536,13 @@ static struct i2c_adapter ivtv_i2c_adap_template = { | |||
| 536 | #endif | 536 | #endif |
| 537 | }; | 537 | }; |
| 538 | 538 | ||
| 539 | static struct i2c_algo_bit_data ivtv_i2c_algo_template = { | 539 | static const struct i2c_algo_bit_data ivtv_i2c_algo_template = { |
| 540 | NULL, /* ?? */ | 540 | .setsda = ivtv_setsda_old, |
| 541 | ivtv_setsda_old, /* setsda function */ | 541 | .setscl = ivtv_setscl_old, |
| 542 | ivtv_setscl_old, /* " */ | 542 | .getsda = ivtv_getsda_old, |
| 543 | ivtv_getsda_old, /* " */ | 543 | .getscl = ivtv_getscl_old, |
| 544 | ivtv_getscl_old, /* " */ | 544 | .udelay = 10, |
| 545 | 10, /* udelay */ | 545 | .timeout = 200, |
| 546 | 200 /* timeout */ | ||
| 547 | }; | 546 | }; |
| 548 | 547 | ||
| 549 | static struct i2c_client ivtv_i2c_client_template = { | 548 | static struct i2c_client ivtv_i2c_client_template = { |