openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

V4L/DVB (13271a): Fix a badly solved merge conflict 

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2009-11-04 12:11:43 -02:00
parent 26b9d6c0b0
commit 648732fcef
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/dvb/dvb-usb/dib0700_devices.c
View File

@ -2135,10 +2135,6 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.num_adapters = 1, .num_adapters = 1,
.adapter = { .adapter = {
{ {
.caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
.pid_filter_count = 32,
.pid_filter = stk70x0p_pid_filter,
.pid_filter_ctrl = stk70x0p_pid_filter_ctrl,
.caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF, .caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
.pid_filter_count = 32, .pid_filter_count = 32,
.pid_filter = stk70x0p_pid_filter, .pid_filter = stk70x0p_pid_filter,
@ -2210,6 +2206,10 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.num_adapters = 1, .num_adapters = 1,
.adapter = { .adapter = {
{ {
.caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
.pid_filter_count = 32,
.pid_filter = stk70x0p_pid_filter,
.pid_filter_ctrl = stk70x0p_pid_filter_ctrl,
.frontend_attach = stk7070p_frontend_attach, .frontend_attach = stk7070p_frontend_attach,
.tuner_attach = dib7070p_tuner_attach, .tuner_attach = dib7070p_tuner_attach,