diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-02-02 12:34:11 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-02 13:01:32 +0100 |
| commit | 757b9bd074312090107bc2582b27c04ea0eb2b88 (patch) | |
| tree | 792f2cef00d465c9b1abf59af9899fc2b46aabc6 | |
| parent | b07525b89f95060dc2d8d954a7a77df4918d8bb8 (diff) | |
| download | linux-stable-757b9bd074312090107bc2582b27c04ea0eb2b88.tar.gz linux-stable-757b9bd074312090107bc2582b27c04ea0eb2b88.tar.bz2 linux-stable-757b9bd074312090107bc2582b27c04ea0eb2b88.zip | |
staging: bcm2835: mark all symbols as 'static'
I got a link error in allyesconfig:
drivers/staging/media/platform/bcm2835/bcm2835-camera.o: In function `vidioc_enum_framesizes':
bcm2835-camera.c:(.text.vidioc_enum_framesizes+0x0): multiple definition of `vidioc_enum_framesizes'
drivers/media/platform/vivid/vivid-vid-cap.o:vivid-vid-cap.c:(.text.vidioc_enum_framesizes+0x0): first defined here
While both drivers are equally at fault for this problem, the bcm2835 one was
just added and is easier to fix, as it is only one file, and none of its symbols
need to be globally visible. This marks the three global symbols as static.
Fixes: 7b3ad5abf027 ("staging: Import the BCM2835 MMAL-based V4L2 camera driver.")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/media/platform/bcm2835/bcm2835-camera.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/media/platform/bcm2835/bcm2835-camera.c b/drivers/staging/media/platform/bcm2835/bcm2835-camera.c index 105d88102cd9..ced8eb5de0f0 100644 --- a/drivers/staging/media/platform/bcm2835/bcm2835-camera.c +++ b/drivers/staging/media/platform/bcm2835/bcm2835-camera.c @@ -50,7 +50,7 @@ MODULE_AUTHOR("Vincent Sanders"); MODULE_LICENSE("GPL"); MODULE_VERSION(BM2835_MMAL_VERSION); -int bcm2835_v4l2_debug; +static int bcm2835_v4l2_debug; module_param_named(debug, bcm2835_v4l2_debug, int, 0644); MODULE_PARM_DESC(bcm2835_v4l2_debug, "Debug level 0-2"); @@ -1312,7 +1312,7 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, return ret; } -int vidioc_enum_framesizes(struct file *file, void *fh, +static int vidioc_enum_framesizes(struct file *file, void *fh, struct v4l2_frmsizeenum *fsize) { struct bm2835_mmal_dev *dev = video_drvdata(file); @@ -1842,7 +1842,7 @@ static int __init bm2835_mmal_init_device(struct bm2835_mmal_dev *dev, return 0; } -void bcm2835_cleanup_instance(struct bm2835_mmal_dev *dev) +static void bcm2835_cleanup_instance(struct bm2835_mmal_dev *dev) { if (!dev) return; |