From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Tue, 30 Dec 2008 00:31:13 +0000 (-0200)
Subject: V4L/DVB (10111a): usbvideo.h: remove an useless blank line
X-Git-Tag: v2.6.29-rc1~556^2~13
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ed716dcb862f969e118037ee8830ad28664b4a11;p=linux-2.6-omap-h63xx.git

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>
---

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
  */