From ed4703877ac87e3131897353eeb13137182e5666 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 16 Sep 2009 09:05:55 -0300 Subject: dib0700_devices: Fix a merge conflict that lead to wrong entry values From: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/dvb/dvb-usb/dib0700_devices.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linux') diff --git a/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c b/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c index 4d812ee73..cc4942c44 100644 --- a/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c +++ b/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c @@ -2372,7 +2372,7 @@ struct dvb_usb_device_properties dib0700_devices[] = { .num_device_descs = 1, .devices = { { "DiBcom STK807xP reference design", - { &dib0700_usb_id_table[56], NULL }, + { &dib0700_usb_id_table[62], NULL }, { NULL }, }, }, @@ -2408,7 +2408,7 @@ struct dvb_usb_device_properties dib0700_devices[] = { .num_device_descs = 1, .devices = { { "DiBcom STK807xPVR reference design", - { &dib0700_usb_id_table[55], NULL }, + { &dib0700_usb_id_table[61], NULL }, { NULL }, }, }, -- cgit v1.2.3