diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-04-27 09:19:50 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-04-27 09:19:50 +1000 |
| commit | 69056e9a43765f5ef7cbf3b9d3ffd4e597271956 (patch) | |
| tree | 13f1f0d54df76d9845a9c30a38491f913851f2a2 | |
| parent | 027b3f8ba9277410c3191d72d1ed2c6146d8a668 (diff) | |
| parent | 077d67374e81c39f3f7b6b57119325f770b810b9 (diff) | |
| download | linux-69056e9a43765f5ef7cbf3b9d3ffd4e597271956.tar.bz2 | |
Merge branch 'drm/next/du' of git://linuxtv.org/pinchartl/fbdev into drm-next
misc rcar changes.
* 'drm/next/du' of git://linuxtv.org/pinchartl/fbdev:
drm: rcar-du: Fix compilation warning
drm: rcar-du: Use ARCH_RENESAS
drm: rcar-du: Clarify vsp dependency
| -rw-r--r-- | drivers/gpu/drm/rcar-du/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/rcar-du/rcar_du_drv.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/rcar-du/Kconfig b/drivers/gpu/drm/rcar-du/Kconfig index 1f10fa0928b4..7fc3ca5ce6c7 100644 --- a/drivers/gpu/drm/rcar-du/Kconfig +++ b/drivers/gpu/drm/rcar-du/Kconfig @@ -2,7 +2,7 @@ config DRM_RCAR_DU tristate "DRM Support for R-Car Display Unit" depends on DRM && OF depends on ARM || ARM64 - depends on ARCH_SHMOBILE || COMPILE_TEST + depends on ARCH_RENESAS || COMPILE_TEST select DRM_KMS_HELPER select DRM_KMS_CMA_HELPER select DRM_GEM_CMA_HELPER @@ -27,6 +27,6 @@ config DRM_RCAR_LVDS config DRM_RCAR_VSP bool "R-Car DU VSP Compositor Support" depends on DRM_RCAR_DU - depends on VIDEO_RENESAS_VSP1 + depends on VIDEO_RENESAS_VSP1=y || (VIDEO_RENESAS_VSP1 && DRM_RCAR_DU=m) help Enable support to expose the R-Car VSP Compositor as KMS planes. diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c index 0f251dc11082..fb9242d27883 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c @@ -297,7 +297,6 @@ static int rcar_du_probe(struct platform_device *pdev) { struct device_node *np = pdev->dev.of_node; struct rcar_du_device *rcdu; - struct drm_connector *connector; struct drm_device *ddev; struct resource *mem; int ret; |