diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2011-10-31 17:23:47 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-12-11 17:13:40 +0400 |
| commit | b10c55d808b32c5386b0efbfe67b13c9a7cf4c9f (patch) | |
| tree | 07a9c78c68fc5862c813046811a9280214d0cdee /drivers/media/video/uvc | |
| parent | 24c3aae0c740ae9837284266ea82234415721dc1 (diff) | |
| download | linux-b10c55d808b32c5386b0efbfe67b13c9a7cf4c9f.tar.xz | |
[media] uvcvideo: Remove duplicate definitions of UVC_STREAM_* macros
The macros are defined in both drivers/media/video/uvc/uvc_video.c and
include/linux/usb/video.h. Remove definitions from the former.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/uvc')
| -rw-r--r-- | drivers/media/video/uvc/uvc_video.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c index 2e5e72825ad1..d8666ec6ffe0 100644 --- a/drivers/media/video/uvc/uvc_video.c +++ b/drivers/media/video/uvc/uvc_video.c @@ -361,16 +361,6 @@ int uvc_commit_video(struct uvc_streaming *stream, * Video codecs */ -/* Values for bmHeaderInfo (Video and Still Image Payload Headers, 2.4.3.3) */ -#define UVC_STREAM_EOH (1 << 7) -#define UVC_STREAM_ERR (1 << 6) -#define UVC_STREAM_STI (1 << 5) -#define UVC_STREAM_RES (1 << 4) -#define UVC_STREAM_SCR (1 << 3) -#define UVC_STREAM_PTS (1 << 2) -#define UVC_STREAM_EOF (1 << 1) -#define UVC_STREAM_FID (1 << 0) - /* Video payload decoding is handled by uvc_video_decode_start(), * uvc_video_decode_data() and uvc_video_decode_end(). * |