diff --git a/[refs] b/[refs]
index dacbb1a70b82..9fb6cc818c4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd9e7c3c42fff48a338f87febee95cd289058bc9
+refs/heads/master: 8a787b40ecf29e5d8cc95bf9f12986862d230d8e
diff --git a/trunk/drivers/media/video/gspca/stv06xx/stv06xx.c b/trunk/drivers/media/video/gspca/stv06xx/stv06xx.c
index 29e43718bfdf..13a021e3cbb7 100644
--- a/trunk/drivers/media/video/gspca/stv06xx/stv06xx.c
+++ b/trunk/drivers/media/video/gspca/stv06xx/stv06xx.c
@@ -33,8 +33,8 @@ MODULE_AUTHOR("Erik Andrén");
 MODULE_DESCRIPTION("STV06XX USB Camera Driver");
 MODULE_LICENSE("GPL");
 
-int dump_bridge;
-int dump_sensor;
+static int dump_bridge;
+static int dump_sensor;
 
 int stv06xx_write_bridge(struct sd *sd, u16 address, u16 i2c_data)
 {
@@ -476,7 +476,7 @@ static int sd_probe(struct usb_interface *intf,
 			       THIS_MODULE);
 }
 
-void sd_disconnect(struct usb_interface *intf)
+static void sd_disconnect(struct usb_interface *intf)
 {
 	struct gspca_dev *gspca_dev = usb_get_intfdata(intf);
 	struct sd *sd = (struct sd *) gspca_dev;