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/dvb/dvb-usb/digitv.c | |
| parent | bfa0d75a1eee59f0577e3c1697ff570b77581a35 (diff) | |
| parent | 4706df3d3c42af802597d82c8b1542c3d52eab23 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/media/dvb/dvb-usb/digitv.c')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/digitv.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c index 9a676afc1d6e..f70e0be0920a 100644 --- a/drivers/media/dvb/dvb-usb/digitv.c +++ b/drivers/media/dvb/dvb-usb/digitv.c | |||
| @@ -77,8 +77,6 @@ static u32 digitv_i2c_func(struct i2c_adapter *adapter) | |||
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | static struct i2c_algorithm digitv_i2c_algo = { | 79 | static struct i2c_algorithm digitv_i2c_algo = { |
| 80 | .name = "Nebula DigiTV USB I2C algorithm", | ||
| 81 | .id = I2C_ALGO_BIT, | ||
| 82 | .master_xfer = digitv_i2c_xfer, | 80 | .master_xfer = digitv_i2c_xfer, |
| 83 | .functionality = digitv_i2c_func, | 81 | .functionality = digitv_i2c_func, |
| 84 | }; | 82 | }; |