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

Browse source

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

...

This commit is contained in:

Mauro Carvalho Chehab 2009-11-04 12:11:43 -02:00

parent 26b9d6c0b0

commit 648732fcef

1 changed files with 4 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

8

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

View file