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

Signed-off-by: N Mauro Carvalho Chehab <mchehab@redhat.com>

V4L/DVB (13271a): Fix a badly solved merge conflict
Signed-off-by: N Mauro Carvalho Chehab <mchehab@redhat.com>
648732fc · Mauro Carvalho Chehab · 26b9d6c0 · 648732fc
隐藏空白更改
内联并排

Showing with 4 addition and 4 deletion

drivers/media/dvb/dvb-usb/dib0700_devices.c drivers/media/dvb/dvb-usb/dib0700_devices.c +4 -4

未找到文件。
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -2135,10 +2135,6 @@ struct dvb_usb_device_properties dib0700_devices[] = {
 		.num_adapters = 1,
 		.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,
 				.pid_filter_count = 32,
 				.pid_filter       = stk70x0p_pid_filter,
@@ -2210,6 +2206,10 @@ struct dvb_usb_device_properties dib0700_devices[] = {
 		.num_adapters = 1,
 		.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,
 				.tuner_attach     = dib7070p_tuner_attach,