diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/media/dvb/dvb-usb/dvb-usb-i2c.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/media/dvb/dvb-usb/dvb-usb-i2c.c')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/dvb-usb-i2c.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c index cead089bbb4f..88e4a62abc44 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c +++ b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c | |||
| @@ -20,7 +20,6 @@ int dvb_usb_i2c_init(struct dvb_usb_device *d) | |||
| 20 | } | 20 | } |
| 21 | 21 | ||
| 22 | strlcpy(d->i2c_adap.name, d->desc->name, sizeof(d->i2c_adap.name)); | 22 | strlcpy(d->i2c_adap.name, d->desc->name, sizeof(d->i2c_adap.name)); |
| 23 | d->i2c_adap.class = I2C_CLASS_TV_DIGITAL, | ||
| 24 | d->i2c_adap.algo = d->props.i2c_algo; | 23 | d->i2c_adap.algo = d->props.i2c_algo; |
| 25 | d->i2c_adap.algo_data = NULL; | 24 | d->i2c_adap.algo_data = NULL; |
| 26 | d->i2c_adap.dev.parent = &d->udev->dev; | 25 | d->i2c_adap.dev.parent = &d->udev->dev; |