From: Laurent Pinchart Date: Mon, 31 Oct 2011 13:23:47 +0000 (-0300) Subject: [media] uvcvideo: Remove duplicate definitions of UVC_STREAM_* macros X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b10c55d808b32c5386b0efbfe67b13c9a7cf4c9f;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [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 Signed-off-by: Mauro Carvalho Chehab --- 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(). *