diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-29 19:31:13 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 06:40:34 -0500 |
| commit | ed716dcb862f969e118037ee8830ad28664b4a11 (patch) | |
| tree | b490e3339726ea26099464bc39130e34c6e2cf87 /drivers/media/video | |
| parent | b48413066118ff8c6e44f258fbcd226f4c22aa92 (diff) | |
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.h | 1 |
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 @@ | |||
| 4 | #include <linux/kernel.h> | 4 | #include <linux/kernel.h> |
| 5 | #include <linux/videodev2.h> | 5 | #include <linux/videodev2.h> |
| 6 | 6 | ||
| 7 | |||
| 8 | /* | 7 | /* |
| 9 | * Dynamic controls | 8 | * Dynamic controls |
| 10 | */ | 9 | */ |