Commit 56a8620a authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Dave Airlie
Browse files

drm: shmobile: fix Kconfig dependencies



The shmobile drm driver selects BACKLIGHT_CLASS_DEVICE
as of 0a5a5499 "drm: shmobile: Add dependency on
BACKLIGHT_CLASS_DEVICE", but that option in turn depends
on BACKLIGHT_LCD_SUPPORT, so we actually have to select
both, or alternatively use 'depends on BACKLIGHT_CLASS_DEVICE'.

Further, the driver uses FB_SH_MOBILE_MERAM if that is
enabled, but this breaks if MERAM is a module while
the DRM driver is built-in. To solve this, add a dependency
on "FB_SH_MOBILE_MERAM || !FB_SH_MOBILE_MERAM", which forces
DRM_SHMOBILE to be a module if FB_SH_MOBILE_MERAM set to 'm'.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDave Airlie <airlied@gmail.com>
parent 8e6a363d
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -2,7 +2,9 @@ config DRM_SHMOBILE
	tristate "DRM Support for SH Mobile"
	depends on DRM && ARM
	depends on ARCH_SHMOBILE || COMPILE_TEST
	depends on FB_SH_MOBILE_MERAM || !FB_SH_MOBILE_MERAM
	select BACKLIGHT_CLASS_DEVICE
	select BACKLIGHT_LCD_SUPPORT
	select DRM_KMS_HELPER
	select DRM_KMS_FB_HELPER
	select DRM_KMS_CMA_HELPER