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_vp1033.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_vp1033.c')
| -rw-r--r-- | drivers/media/dvb/mantis/mantis_vp1033.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/mantis/mantis_vp1033.c b/drivers/media/dvb/mantis/mantis_vp1033.c index 4a723bda0031..2ae0afa7756b 100644 --- a/drivers/media/dvb/mantis/mantis_vp1033.c +++ b/drivers/media/dvb/mantis/mantis_vp1033.c | |||
| @@ -37,7 +37,7 @@ | |||
| 37 | 37 | ||
| 38 | u8 lgtdqcs001f_inittab[] = { | 38 | u8 lgtdqcs001f_inittab[] = { |
| 39 | 0x01, 0x15, | 39 | 0x01, 0x15, |
| 40 | 0x02, 0x00, | 40 | 0x02, 0x30, |
| 41 | 0x03, 0x00, | 41 | 0x03, 0x00, |
| 42 | 0x04, 0x2a, | 42 | 0x04, 0x2a, |
| 43 | 0x05, 0x85, | 43 | 0x05, 0x85, |
| @@ -173,7 +173,7 @@ static int vp1033_frontend_init(struct mantis_pci *mantis, struct dvb_frontend * | |||
| 173 | msleep(250); | 173 | msleep(250); |
| 174 | 174 | ||
| 175 | dprintk(MANTIS_ERROR, 1, "Probing for STV0299 (DVB-S)"); | 175 | dprintk(MANTIS_ERROR, 1, "Probing for STV0299 (DVB-S)"); |
| 176 | fe = stv0299_attach(&lgtdqcs001f_config, adapter); | 176 | fe = dvb_attach(stv0299_attach, &lgtdqcs001f_config, adapter); |
| 177 | 177 | ||
| 178 | if (fe) { | 178 | if (fe) { |
| 179 | fe->ops.tuner_ops.set_params = lgtdqcs001f_tuner_set; | 179 | fe->ops.tuner_ops.set_params = lgtdqcs001f_tuner_set; |