summaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-12-30 01:31:13 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-30 12:40:34 +0100
commited716dcb862f969e118037ee8830ad28664b4a11 (patch)
treeb490e3339726ea26099464bc39130e34c6e2cf87 /drivers/media/video
parentV4L/DVB (10111): quickcam_messenger.c: fix a warning (diff)
downloadlinux-ed716dcb862f969e118037ee8830ad28664b4a11.tar.xz
linux-ed716dcb862f969e118037ee8830ad28664b4a11.zip
V4L/DVB (10111a): usbvideo.h: remove an useless blank line
This is needed to sync with the development tree. Probably, a merge conflict were solved by adding this blank line. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/uvc/uvcvideo.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h
index 731cf7951656..896b791ece15 100644
--- a/drivers/media/video/uvc/uvcvideo.h
+++ b/drivers/media/video/uvc/uvcvideo.h
@@ -4,7 +4,6 @@
#include <linux/kernel.h>
#include <linux/videodev2.h>
-
/*
* Dynamic controls
*/