diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-29 18:35:51 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 09:40:16 -0200 |
| commit | 8a787b40ecf29e5d8cc95bf9f12986862d230d8e (patch) | |
| tree | 11bc77a48358db82fd06bc4136a4aceb8cfe1c91 | |
| parent | dd9e7c3c42fff48a338f87febee95cd289058bc9 (diff) | |
| download | blackbird-op-linux-8a787b40ecf29e5d8cc95bf9f12986862d230d8e.tar.gz blackbird-op-linux-8a787b40ecf29e5d8cc95bf9f12986862d230d8e.zip | |
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>
| -rw-r--r-- | drivers/media/video/gspca/stv06xx/stv06xx.c | 6 |
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"); 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; |
