diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2016-09-11 05:51:54 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-09-12 06:42:24 -0300 |
| commit | 34b27b13a2cd43e0d27e3ce13b96119efbbbedbc (patch) | |
| tree | 7733db87963b9b174f0c56c760d92da4d81e15d9 /drivers/media/platform/Makefile | |
| parent | 8a5a2ba86ab8fc12267fea974b9cd730ad2dee24 (diff) | |
| download | op-kernel-dev-34b27b13a2cd43e0d27e3ce13b96119efbbbedbc.zip op-kernel-dev-34b27b13a2cd43e0d27e3ce13b96119efbbbedbc.tar.gz | |
[media] pxa_camera: merge soc_mediabus.c into pxa_camera.c
Linking soc_mediabus into this driver causes multiple definition linker warnings
if soc_camera is also enabled:
drivers/media/platform/soc_camera/built-in.o:(___ksymtab+soc_mbus_image_size+0x0): multiple definition of `__ksymtab_soc_mbus_image_size'
drivers/media/platform/soc_camera/soc_mediabus.o:(___ksymtab+soc_mbus_image_size+0x0): first defined here
>> drivers/media/platform/soc_camera/built-in.o:(___ksymtab+soc_mbus_samples_per_pixel+0x0): multiple definition of `__ksymtab_soc_mbus_samples_per_pixel'
drivers/media/platform/soc_camera/soc_mediabus.o:(___ksymtab+soc_mbus_samples_per_pixel+0x0): first defined here
drivers/media/platform/soc_camera/built-in.o: In function `soc_mbus_config_compatible':
(.text+0x3840): multiple definition of `soc_mbus_config_compatible'
drivers/media/platform/soc_camera/soc_mediabus.o:(.text+0x134): first defined here
Since we really don't want to have to use any of the soc-camera code this patch
copies the relevant code and data structures from soc_mediabus and renames it to pxa_mbus_*.
The large table of formats has been culled a bit, removing formats that are not supported
by this driver.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/platform/Makefile')
| -rw-r--r-- | drivers/media/platform/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index c645a50..40b18d1 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -9,7 +9,7 @@ obj-$(CONFIG_VIDEO_CAFE_CCIC) += marvell-ccic/ obj-$(CONFIG_VIDEO_MMP_CAMERA) += marvell-ccic/ obj-$(CONFIG_VIDEO_OMAP3) += omap3isp/ -obj-$(CONFIG_VIDEO_PXA27x) += pxa_camera.o soc_camera/soc_mediabus.o +obj-$(CONFIG_VIDEO_PXA27x) += pxa_camera.o obj-$(CONFIG_VIDEO_VIU) += fsl-viu.o |
