From bb6dafdba6b0b82d2b75ae0c642f453b036c0f84 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Fri, 8 Jan 2021 12:24:41 +0100 Subject: [PATCH] video: omapfb2: Make standard and custom DSI command mode panel driver mutually exclusive Standard DRM panel driver for DSI command mode panel used by omapfb2 is also available now. Just like the other panels its module name clashes with the module from drivers/video/fbdev/omap2/omapfb/displays, part of the deprecated omapfb2 fbdev driver. As omapfb2 can only be compiled when the omapdrm driver is disabled, and the DRM panel drivers are useless in that case, make the omapfb2 panel depend on the standard DRM panels being disabled to fix the name clash. Fixes: cf64148abcfd ("drm/panel: Move OMAP's DSI command mode panel driver") Reported-by: Stephen Rothwell Signed-off-by: Sebastian Reichel Acked-by: Sam Ravnborg Signed-off-by: Tomi Valkeinen Link: https://patchwork.freedesktop.org/patch/msgid/20210108112441.14609-1-sebastian.reichel@collabora.com --- drivers/video/fbdev/omap2/omapfb/displays/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/video/fbdev/omap2/omapfb/displays/Kconfig b/drivers/video/fbdev/omap2/omapfb/displays/Kconfig index 744416dc..3ca1bd7 100644 --- a/drivers/video/fbdev/omap2/omapfb/displays/Kconfig +++ b/drivers/video/fbdev/omap2/omapfb/displays/Kconfig @@ -43,6 +43,7 @@ config FB_OMAP2_PANEL_DPI config FB_OMAP2_PANEL_DSI_CM tristate "Generic DSI Command Mode Panel" depends on BACKLIGHT_CLASS_DEVICE + depends on DRM_PANEL_DSI_CM = n help Driver for generic DSI command mode panels. -- 2.7.4