diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-16 09:05:55 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-16 09:05:55 -0300 |
| commit | ed4703877ac87e3131897353eeb13137182e5666 (patch) | |
| tree | defc7ee78a336dc6541f4b1753381df74d6d3db3 /linux/drivers/media/dvb | |
| parent | 85d13c8ef6cb0f70323a77515b59f5a4d2444d3f (diff) | |
| download | mediapointer-dvb-s2-ed4703877ac87e3131897353eeb13137182e5666.tar.gz mediapointer-dvb-s2-ed4703877ac87e3131897353eeb13137182e5666.tar.bz2 | |
dib0700_devices: Fix a merge conflict that lead to wrong entry values
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/dib0700_devices.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 }, }, }, |