From 234b2da50fe9a2877c20b15e616b91c7c1ede5a8 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Wed, 11 May 2011 09:56:20 -0300
Subject: [PATCH] --- yaml --- r: 250302 b: refs/heads/master c:
 7225a1dcc38f28fcc6178258b2072d12742f68d9 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/media/video/uvc/uvc_driver.c | 5 +++++
 trunk/drivers/media/video/uvc/uvcvideo.h   | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3c177c524afe..a63101a7c043 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e59fd0592430cee4595c600427899a3404861e7
+refs/heads/master: 7225a1dcc38f28fcc6178258b2072d12742f68d9
diff --git a/trunk/drivers/media/video/uvc/uvc_driver.c b/trunk/drivers/media/video/uvc/uvc_driver.c
index 496a9de6abd6..823f4b389745 100644
--- a/trunk/drivers/media/video/uvc/uvc_driver.c
+++ b/trunk/drivers/media/video/uvc/uvc_driver.c
@@ -83,6 +83,11 @@ static struct uvc_format_desc uvc_fmts[] = {
 		.guid		= UVC_GUID_FORMAT_I420,
 		.fcc		= V4L2_PIX_FMT_YUV420,
 	},
+	{
+		.name		= "YUV 4:2:0 (M420)",
+		.guid		= UVC_GUID_FORMAT_M420,
+		.fcc		= V4L2_PIX_FMT_M420,
+	},
 	{
 		.name		= "YUV 4:2:2 (UYVY)",
 		.guid		= UVC_GUID_FORMAT_UYVY,
diff --git a/trunk/drivers/media/video/uvc/uvcvideo.h b/trunk/drivers/media/video/uvc/uvcvideo.h
index 0275613c5f33..7cf224bae2e5 100644
--- a/trunk/drivers/media/video/uvc/uvcvideo.h
+++ b/trunk/drivers/media/video/uvc/uvcvideo.h
@@ -172,6 +172,9 @@ struct uvc_xu_control {
 #define UVC_GUID_FORMAT_RGBP \
 	{ 'R',  'G',  'B',  'P', 0x00, 0x00, 0x10, 0x00, \
 	 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}
+#define UVC_GUID_FORMAT_M420 \
+	{ 'M',  '4',  '2',  '0', 0x00, 0x00, 0x10, 0x00, \
+	 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}
 
 /* ------------------------------------------------------------------------
  * Driver specific constants.