diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-01-29 17:16:38 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2015-01-31 10:11:54 +1000 |
| commit | 56a8620a15bbc05d8ef57ace7fc769372de1178a (patch) | |
| tree | d86da52078e048d0e5d98481b0635efb5e58eab0 | |
| parent | 8e6a363def27b2bfe0c9fcb325350f4d1b538443 (diff) | |
| download | linux-stable-56a8620a15bbc05d8ef57ace7fc769372de1178a.tar.gz linux-stable-56a8620a15bbc05d8ef57ace7fc769372de1178a.tar.bz2 linux-stable-56a8620a15bbc05d8ef57ace7fc769372de1178a.zip | |
drm: shmobile: fix Kconfig dependencies
The shmobile drm driver selects BACKLIGHT_CLASS_DEVICE
as of 0a5a5499ad88 "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: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Dave Airlie <airlied@gmail.com>
| -rw-r--r-- | drivers/gpu/drm/shmobile/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/shmobile/Kconfig b/drivers/gpu/drm/shmobile/Kconfig index a50fe0eeaa0d..8d17d00ddb4b 100644 --- a/drivers/gpu/drm/shmobile/Kconfig +++ b/drivers/gpu/drm/shmobile/Kconfig @@ -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 |