diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-06-27 11:45:23 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-06-27 11:45:23 +1000 |
| commit | f6da26ec38cfef373950badfecaf34edcfe15da2 (patch) | |
| tree | 61bd0f2f8a18d406e2505e8e704837a173baab9e /drivers | |
| parent | d7213eaee6a57d8ace917d864756126d0bbf7111 (diff) | |
| parent | 7e40b5162b3cbd4efe786f874abfbe60b691f0e1 (diff) | |
Merge remote-tracking branch 'drm-panel/drm/panel/for-next'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/panel/Kconfig | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig index 4ec874da5668..bee9f72b3a93 100644 --- a/drivers/gpu/drm/panel/Kconfig +++ b/drivers/gpu/drm/panel/Kconfig @@ -5,7 +5,7 @@ config DRM_PANEL Panel registration and lookup framework. menu "Display Panels" - depends on DRM_PANEL + depends on DRM && DRM_PANEL config DRM_PANEL_SIMPLE tristate "support for simple panels" @@ -18,14 +18,11 @@ config DRM_PANEL_SIMPLE config DRM_PANEL_LD9040 tristate "LD9040 RGB/SPI panel" - depends on DRM && DRM_PANEL - depends on OF - select SPI + depends on OF && SPI select VIDEOMODE_HELPERS config DRM_PANEL_S6E8AA0 tristate "S6E8AA0 DSI video mode panel" - depends on DRM && DRM_PANEL depends on OF select DRM_MIPI_DSI select VIDEOMODE_HELPERS |