summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-12-29 22:31:13 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-30 09:40:34 -0200
commited716dcb862f969e118037ee8830ad28664b4a11 (patch)
treeb490e3339726ea26099464bc39130e34c6e2cf87 /drivers
parentb48413066118ff8c6e44f258fbcd226f4c22aa92 (diff)
downloadlinux-3.10-ed716dcb862f969e118037ee8830ad28664b4a11.tar.gz
linux-3.10-ed716dcb862f969e118037ee8830ad28664b4a11.tar.bz2
linux-3.10-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')
-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 731cf795165..896b791ece1 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
*/