diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2015-08-14 12:16:43 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-08-19 15:48:59 +0200 |
| commit | 368b2490434d2c675f22a5c9a8457e7675a62e50 (patch) | |
| tree | ca5c9915ee6fdc5a17bbdb0d7dc3858cd410492f /drivers/video/imx-ipu-fb.c | |
| parent | 3ea5798a9f8e1675cbdd2ffc8673a8db95b3dda1 (diff) | |
| download | barebox-368b2490434d2c675f22a5c9a8457e7675a62e50.tar.gz barebox-368b2490434d2c675f22a5c9a8457e7675a62e50.tar.xz | |
video: ipu-fb: mark internally used functions as static
Fixes symbol clashes with the IPUv3 driver:
In function `ipu_ch_param_write_field':
drivers/video/imx-ipu-v3/ipu-common.c:103: multiple definition of `ipu_ch_param_write_field'
drivers/video/imx-ipu-fb.c:359: first defined here
In function `ipu_cpmem_set_format_rgb':
drivers/video/imx-ipu-v3/ipu-common.c:155: multiple definition of `ipu_cpmem_set_format_rgb'
drivers/video/imx-ipu-fb.c:504: first defined here
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/video/imx-ipu-fb.c')
| -rw-r--r-- | drivers/video/imx-ipu-fb.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/imx-ipu-fb.c b/drivers/video/imx-ipu-fb.c index b56658202c..a87e720d96 100644 --- a/drivers/video/imx-ipu-fb.c +++ b/drivers/video/imx-ipu-fb.c @@ -355,7 +355,8 @@ struct ipu_ch_param { struct ipu_cpmem_word word[2]; }; -void ipu_ch_param_write_field(struct ipu_ch_param __iomem *base, u32 wbs, u32 v) +static void ipu_ch_param_write_field(struct ipu_ch_param __iomem *base, + u32 wbs, u32 v) { u32 bit = (wbs >> 8) % 160; u32 size = wbs & 0xff; @@ -500,7 +501,8 @@ static int sdc_init_panel(struct fb_info *info, enum disp_data_mapping fmt) return 0; } -int ipu_cpmem_set_format_rgb(struct ipu_ch_param *p, struct imx_ipu_fb_rgb *rgb) +static int ipu_cpmem_set_format_rgb(struct ipu_ch_param *p, + struct imx_ipu_fb_rgb *rgb) { int bpp = 0, npb = 0, ro, go, bo, to; |