diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /drivers/media/dvb/dvb-usb/cxusb.c | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'drivers/media/dvb/dvb-usb/cxusb.c')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/cxusb.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c index c3e1b661aae6..9e96a188f1e9 100644 --- a/drivers/media/dvb/dvb-usb/cxusb.c +++ b/drivers/media/dvb/dvb-usb/cxusb.c | |||
| @@ -141,8 +141,6 @@ static u32 cxusb_i2c_func(struct i2c_adapter *adapter) | |||
| 141 | } | 141 | } |
| 142 | 142 | ||
| 143 | static struct i2c_algorithm cxusb_i2c_algo = { | 143 | static struct i2c_algorithm cxusb_i2c_algo = { |
| 144 | .name = "Conexant USB I2C algorithm", | ||
| 145 | .id = I2C_ALGO_BIT, | ||
| 146 | .master_xfer = cxusb_i2c_xfer, | 144 | .master_xfer = cxusb_i2c_xfer, |
| 147 | .functionality = cxusb_i2c_func, | 145 | .functionality = cxusb_i2c_func, |
| 148 | }; | 146 | }; |