From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Mon, 29 Dec 2008 21:35:51 +0000 (-0300)
Subject: V4L/DVB (10107): More than one driver defines the same var name (dump_bridge). Add
X-Git-Tag: v2.6.29-rc1~556^2~48
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8a787b40ecf29e5d8cc95bf9f12986862d230d8e;p=linux-2.6-omap-h63xx.git

V4L/DVB (10107): More than one driver defines the same var name (dump_bridge). Add

"static" on stv06xx for all static functions and parameters to avoid
such troubles.

Cc: Erik Andren <erik.andren@gmail.com>
Cc: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/gspca/stv06xx/stv06xx.c b/drivers/media/video/gspca/stv06xx/stv06xx.c
index 29e43718bfd..13a021e3cbb 100644
--- a/drivers/media/video/gspca/stv06xx/stv06xx.c
+++ b/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;