diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-21 14:05:45 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-21 14:05:45 -0500 |
| commit | d04cdb64212eb5ae6a98026a97dda626e40e8e9a (patch) | |
| tree | b6a7dbb21ccfceb915844e9a330b3d3dfcaf3c5b /drivers/media/video/em28xx/em28xx-i2c.c | |
| parent | 2f8600dff2b140096a7df781884e918a16aa90e0 (diff) | |
| parent | ec1248e70edc5cf7b485efcc7b41e44e10f422e5 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-i2c.c')
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-i2c.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c index 6ca8631bc36d..5b6cece37aee 100644 --- a/drivers/media/video/em28xx/em28xx-i2c.c +++ b/drivers/media/video/em28xx/em28xx-i2c.c | |||
| @@ -420,7 +420,6 @@ static int em28xx_set_tuner(int check_eeprom, struct i2c_client *client) | |||
| 420 | tun_setup.mode_mask = T_ANALOG_TV | T_RADIO; | 420 | tun_setup.mode_mask = T_ANALOG_TV | T_RADIO; |
| 421 | tun_setup.type = dev->tuner_type; | 421 | tun_setup.type = dev->tuner_type; |
| 422 | tun_setup.addr = dev->tuner_addr; | 422 | tun_setup.addr = dev->tuner_addr; |
| 423 | |||
| 424 | em28xx_i2c_call_clients(dev, TUNER_SET_TYPE_ADDR, &tun_setup); | 423 | em28xx_i2c_call_clients(dev, TUNER_SET_TYPE_ADDR, &tun_setup); |
| 425 | } | 424 | } |
| 426 | 425 | ||