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/dvb/dvb-usb/cxusb.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/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 | }; |