diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-11-04 09:11:43 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-12-05 15:41:11 -0500 |
| commit | 648732fcefa73932ae8caa8bcfd262863904dd66 (patch) | |
| tree | 51da4f1481bbbf9eee6c14ca8fb5c78e3028448e | |
| parent | 26b9d6c0b0e91c84b4713da5abd16baef3963d33 (diff) | |
V4L/DVB (13271a): Fix a badly solved merge conflict
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/dvb/dvb-usb/dib0700_devices.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c index 1ec1a4cb0472..c8034d5c817c 100644 --- a/drivers/media/dvb/dvb-usb/dib0700_devices.c +++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c | |||
| @@ -2139,10 +2139,6 @@ struct dvb_usb_device_properties dib0700_devices[] = { | |||
| 2139 | .pid_filter_count = 32, | 2139 | .pid_filter_count = 32, |
| 2140 | .pid_filter = stk70x0p_pid_filter, | 2140 | .pid_filter = stk70x0p_pid_filter, |
| 2141 | .pid_filter_ctrl = stk70x0p_pid_filter_ctrl, | 2141 | .pid_filter_ctrl = stk70x0p_pid_filter_ctrl, |
| 2142 | .caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF, | ||
| 2143 | .pid_filter_count = 32, | ||
| 2144 | .pid_filter = stk70x0p_pid_filter, | ||
| 2145 | .pid_filter_ctrl = stk70x0p_pid_filter_ctrl, | ||
| 2146 | .frontend_attach = stk7070p_frontend_attach, | 2142 | .frontend_attach = stk7070p_frontend_attach, |
| 2147 | .tuner_attach = dib7070p_tuner_attach, | 2143 | .tuner_attach = dib7070p_tuner_attach, |
| 2148 | 2144 | ||
| @@ -2210,6 +2206,10 @@ struct dvb_usb_device_properties dib0700_devices[] = { | |||
| 2210 | .num_adapters = 1, | 2206 | .num_adapters = 1, |
| 2211 | .adapter = { | 2207 | .adapter = { |
| 2212 | { | 2208 | { |
| 2209 | .caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF, | ||
| 2210 | .pid_filter_count = 32, | ||
| 2211 | .pid_filter = stk70x0p_pid_filter, | ||
| 2212 | .pid_filter_ctrl = stk70x0p_pid_filter_ctrl, | ||
| 2213 | .frontend_attach = stk7070p_frontend_attach, | 2213 | .frontend_attach = stk7070p_frontend_attach, |
| 2214 | .tuner_attach = dib7070p_tuner_attach, | 2214 | .tuner_attach = dib7070p_tuner_attach, |
| 2215 | 2215 | ||