Skip to content
Commit b0c4be8c authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

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



Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 47aeba5a
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment