[media] uvcvideo: Remove duplicate definitions of UVC_STREAM_* macros
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Mon, 31 Oct 2011 13:23:47 +0000 (10:23 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sun, 11 Dec 2011 13:13:40 +0000 (11:13 -0200)
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>
drivers/media/video/uvc/uvc_video.c

index 2e5e72825ad19ca2c1015a82bd9b072b2b4a264c..d8666ec6ffe096a1a9abcea8194553c38112186b 100644 (file)
@@ -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().
  *