diff --git a/[refs] b/[refs]
index 12926a06abda..809216c1a9f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa34168bd8979ef00dbc35dbca6d7564d4e42798
+refs/heads/master: f9d81df9b8d77f238b3053eb645572ab6651cc8d
diff --git a/trunk/drivers/media/video/uvc/uvc_ctrl.c b/trunk/drivers/media/video/uvc/uvc_ctrl.c
index bce29fdde52d..d8dc1e191760 100644
--- a/trunk/drivers/media/video/uvc/uvc_ctrl.c
+++ b/trunk/drivers/media/video/uvc/uvc_ctrl.c
@@ -727,7 +727,8 @@ static const __u8 uvc_camera_guid[16] = UVC_GUID_UVC_CAMERA;
 static const __u8 uvc_media_transport_input_guid[16] =
 	UVC_GUID_UVC_MEDIA_TRANSPORT_INPUT;
 
-static int uvc_entity_match_guid(struct uvc_entity *entity, __u8 guid[16])
+static int uvc_entity_match_guid(const struct uvc_entity *entity,
+	const __u8 guid[16])
 {
 	switch (UVC_ENTITY_TYPE(entity)) {
 	case UVC_ITT_CAMERA: