Skip to content

Commit 549d899

Browse files
arndbhverkuil
authored andcommitted
media: vivid: fix FB dependency
It's not enough to have a dependency on CONFIG_FB, as that can be in a loadable module when vivid itself is builtin: drivers/media/test-drivers/vivid/vivid-osd.o: in function `vivid_fb_init': vivid-osd.c:(.text+0xdc0): undefined reference to `fb_alloc_cmap' vivid-osd.c:(.text+0xe26): undefined reference to `register_framebuffer' Change the dependency to only allow configurations that can be built, but change the FB to FB_CORE so this is also possible when using DRM with FB compatibility rather than full fbdev. Fixes: 20889dd ("media: vivid: Introduce VIDEO_VIVID_OSD") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Ricardo Ribalda <ribalda@chromium.org> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
1 parent 0af2f6b commit 549d899

File tree

1 file changed

+2
-1
lines changed
  • drivers/media/test-drivers/vivid

1 file changed

+2
-1
lines changed

drivers/media/test-drivers/vivid/Kconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ config VIDEO_VIVID_CEC
3232

3333
config VIDEO_VIVID_OSD
3434
bool "Enable Framebuffer for testing Output Overlay"
35-
depends on VIDEO_VIVID && FB
35+
depends on VIDEO_VIVID && FB_CORE
36+
depends on VIDEO_VIVID=m || FB_CORE=y
3637
default y
3738
select FB_IOMEM_HELPERS
3839
help

0 commit comments

Comments
 (0)