diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-01-11 17:47:25 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-01-11 17:47:25 -0800 |
| commit | 009f773836513960d3982e80c86e266d25528563 (patch) | |
| tree | 7315e5666698997dee34a80c1a1db801d3f8879b /drivers/gpu/drm/rcar-du/Kconfig | |
| parent | dd0d0d4de582a6a61c032332c91f4f4cb2bab569 (diff) | |
| parent | 6544a1df11c48c8413071aac3316792e4678fbfb (diff) | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 4.5 merge window.
Diffstat (limited to 'drivers/gpu/drm/rcar-du/Kconfig')
| -rw-r--r-- | drivers/gpu/drm/rcar-du/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/rcar-du/Kconfig b/drivers/gpu/drm/rcar-du/Kconfig index 11485a4a16ae..d4e0a39568f6 100644 --- a/drivers/gpu/drm/rcar-du/Kconfig +++ b/drivers/gpu/drm/rcar-du/Kconfig @@ -1,6 +1,6 @@ config DRM_RCAR_DU tristate "DRM Support for R-Car Display Unit" - depends on DRM && ARM && HAVE_DMA_ATTRS + depends on DRM && ARM && HAVE_DMA_ATTRS && OF depends on ARCH_SHMOBILE || COMPILE_TEST select DRM_KMS_HELPER select DRM_KMS_CMA_HELPER |