diff --git a/[refs] b/[refs]
index e12094732eac..30da5814ea3c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b5e45cdf9ffe53bf49d78414a9b36bb527fafe8
+refs/heads/master: c6dc725c8e0c3438587e18f918f6da16e7a23539
diff --git a/trunk/drivers/media/video/gspca/gl860/gl860-mi2020.c b/trunk/drivers/media/video/gspca/gl860/gl860-mi2020.c
index 4ba7ea258ddf..57782e011c9e 100644
--- a/trunk/drivers/media/video/gspca/gl860/gl860-mi2020.c
+++ b/trunk/drivers/media/video/gspca/gl860/gl860-mi2020.c
@@ -558,7 +558,7 @@ static int mi2020_configure_alt(struct gspca_dev *gspca_dev)
 	return 0;
 }
 
-int mi2020_camera_settings(struct gspca_dev *gspca_dev)
+static int mi2020_camera_settings(struct gspca_dev *gspca_dev)
 {
 	struct sd *sd = (struct sd *) gspca_dev;
 	s32 reso = gspca_dev->cam.cam_mode[(s32) gspca_dev->curr_mode].priv;