V4L/DVB (10154): saa7134: fix a merge conflict on Behold H6 board

Browse source

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

...

This commit is contained in:

Mauro Carvalho Chehab 2008-12-30 19:10:09 -03:00

parent 47aeba5add

commit b0c4be8cff

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

6

drivers/media/video/saa7134/saa7134-dvb.c

View file