aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-12-29 16:35:51 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-30 06:40:16 -0500
commit8a787b40ecf29e5d8cc95bf9f12986862d230d8e (patch)
tree11bc77a48358db82fd06bc4136a4aceb8cfe1c91 /drivers/media
parentdd9e7c3c42fff48a338f87febee95cd289058bc9 (diff)
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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/gspca/stv06xx/stv06xx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/gspca/stv06xx/stv06xx.c b/drivers/media/video/gspca/stv06xx/stv06xx.c
index 29e43718bfdf..13a021e3cbb7 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");
33MODULE_DESCRIPTION("STV06XX USB Camera Driver"); 33MODULE_DESCRIPTION("STV06XX USB Camera Driver");
34MODULE_LICENSE("GPL"); 34MODULE_LICENSE("GPL");
35 35
36int dump_bridge; 36static int dump_bridge;
37int dump_sensor; 37static int dump_sensor;
38 38
39int stv06xx_write_bridge(struct sd *sd, u16 address, u16 i2c_data) 39int stv06xx_write_bridge(struct sd *sd, u16 address, u16 i2c_data)
40{ 40{
@@ -476,7 +476,7 @@ static int sd_probe(struct usb_interface *intf,
476 THIS_MODULE); 476 THIS_MODULE);
477} 477}
478 478
479void sd_disconnect(struct usb_interface *intf) 479static void sd_disconnect(struct usb_interface *intf)
480{ 480{
481 struct gspca_dev *gspca_dev = usb_get_intfdata(intf); 481 struct gspca_dev *gspca_dev = usb_get_intfdata(intf);
482 struct sd *sd = (struct sd *) gspca_dev; 482 struct sd *sd = (struct sd *) gspca_dev;