diff options
| author | Arnd Bergmann | 2018-05-25 17:25:12 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2018-06-06 20:37:51 +0200 |
| commit | 48a8bbc7ca494709522621929f8407ab823d73fc (patch) | |
| tree | 814e64da1aa4fb5e5646351294fff43c0e3d761b | |
| parent | media: media/radio/Kconfig: add back RADIO_ISA (diff) | |
| download | kernel-qcow2-linux-48a8bbc7ca494709522621929f8407ab823d73fc.tar.gz kernel-qcow2-linux-48a8bbc7ca494709522621929f8407ab823d73fc.tar.xz kernel-qcow2-linux-48a8bbc7ca494709522621929f8407ab823d73fc.zip | |
media: omap2: fix compile-testing with FB_OMAP2=m
Compile-testing with FB_OMAP2=m results in a link error:
drivers/media/platform/omap/omap_vout.o: In function `vidioc_streamoff':
omap_vout.c:(.text+0x1028): undefined reference to `omap_dispc_unregister_isr'
drivers/media/platform/omap/omap_vout.o: In function `omap_vout_release':
omap_vout.c:(.text+0x1330): undefined reference to `omap_dispc_unregister_isr'
drivers/media/platform/omap/omap_vout.o: In function `vidioc_streamon':
omap_vout.c:(.text+0x2dd4): undefined reference to `omap_dispc_register_isr'
drivers/media/platform/omap/omap_vout.o: In function `omap_vout_remove':
In order to enable compile-testing but still keep the correct dependency,
this changes the Kconfig logic so we only allow CONFIG_COMPILE_TEST
building when FB_OMAP is completely disabled, or have use the old
dependency on FB_OMAP to ensure VIDEO_OMAP2_VOUT is also a loadable
module when FB_OMAP2 is.
Fixes: d8555fd2f452 ("media: omap2: allow building it with COMPILE_TEST && DRM_OMAP")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
| -rw-r--r-- | drivers/media/platform/omap/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/omap/Kconfig b/drivers/media/platform/omap/Kconfig index a414bcbb9b08..d827b6c285a6 100644 --- a/drivers/media/platform/omap/Kconfig +++ b/drivers/media/platform/omap/Kconfig @@ -6,7 +6,7 @@ config VIDEO_OMAP2_VOUT_VRFB config VIDEO_OMAP2_VOUT tristate "OMAP2/OMAP3 V4L2-Display driver" depends on MMU - depends on FB_OMAP2 || COMPILE_TEST + depends on FB_OMAP2 || (COMPILE_TEST && FB_OMAP2=n) depends on ARCH_OMAP2 || ARCH_OMAP3 || COMPILE_TEST select VIDEOBUF_GEN select VIDEOBUF_DMA_CONTIG |