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/mantis/mantis_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/mantis/mantis_i2c.c')
| -rw-r--r-- | drivers/media/dvb/mantis/mantis_i2c.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/dvb/mantis/mantis_i2c.c b/drivers/media/dvb/mantis/mantis_i2c.c index 7870bcf9689a..e7794517fe26 100644 --- a/drivers/media/dvb/mantis/mantis_i2c.c +++ b/drivers/media/dvb/mantis/mantis_i2c.c | |||
| @@ -229,7 +229,6 @@ int __devinit mantis_i2c_init(struct mantis_pci *mantis) | |||
| 229 | i2c_set_adapdata(i2c_adapter, mantis); | 229 | i2c_set_adapdata(i2c_adapter, mantis); |
| 230 | 230 | ||
| 231 | i2c_adapter->owner = THIS_MODULE; | 231 | i2c_adapter->owner = THIS_MODULE; |
| 232 | i2c_adapter->class = I2C_CLASS_TV_DIGITAL; | ||
| 233 | i2c_adapter->algo = &mantis_algo; | 232 | i2c_adapter->algo = &mantis_algo; |
| 234 | i2c_adapter->algo_data = NULL; | 233 | i2c_adapter->algo_data = NULL; |
| 235 | i2c_adapter->timeout = 500; | 234 | i2c_adapter->timeout = 500; |