[media] v4l2-ctrls: Fix a merge conflict

Browse source

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

...

This commit is contained in:

Mauro Carvalho Chehab 2011-07-10 16:34:48 -03:00

parent 064f50966e

commit ebee4b589f

1 changed files with 0 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

2

drivers/media/video/v4l2-ctrls.c

View file