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/dvb-usb/af9005.c | |
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/dvb-usb/af9005.c')
0 files changed, 0 insertions, 0 deletions