V4L/DVB (13271a): Fix a badly solved merge conflict (648732fc) · Commits · e / devices / android_kernel_oneplus_sm7250

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

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -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,