Commit 9fa0f6db authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB (8522): videodev2: Fix merge conflict 



Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 74b9ef21

include/linux/videodev2.h

+2 −2

File changed.

Contains only whitespace changes.