V4L/DVB (8559a): Fix a merge conflict at gspca/sonixb

Browse source

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

...

This commit is contained in:

Mauro Carvalho Chehab 2008-08-06 20:13:46 -03:00 • committed by Mauro Carvalho Chehab

parent 7686ad5606

commit 2389b36072

1 changed files with 2 additions and 2 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

4

drivers/media/video/gspca/sonixb.c

View file