Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2014-08-13 15:20:31 +0200
committerAndreas Färber <afaerber@suse.de>2014-08-13 15:20:31 +0200
commitf92487dbd7a305531e4cc54c41609b8f77a1bc30 (patch)
tree2fc137799d4306e2abb0bfebcb3d4d909c1f9047
parent1b1d9dae6a2b1ad54f947868dd2dce9ecbd27464 (diff)
config: armv7hl: Disable OMAP DRM
To avoid errors such as: ../drivers/gpu/drm/omapdrm/omap_plane.c: In function 'omap_plane_pre_apply': ../drivers/gpu/drm/omapdrm/omap_plane.c:145:2: error: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'dma_addr_t' [-Werror=format=] DBG("%d,%d %08x %08x", info->pos_x, info->pos_y, ^ ../drivers/gpu/drm/omapdrm/omap_plane.c:145:2: error: format '%x' expects argument of type 'unsigned int', but argument 6 has type 'dma_addr_t' [-Werror=format=] cc1: all warnings being treated as errors disable OMAP DRM for now. Two patches were sent upstream by Matwey V. Kornilov but didn't find their way into v3.16. Once patches are applied, revert this commit. Signed-off-by: Andreas Färber <afaerber@suse.de>
-rw-r--r--config/armv7hl/default3
-rw-r--r--config/armv7hl/lpae3
2 files changed, 2 insertions, 4 deletions
diff --git a/config/armv7hl/default b/config/armv7hl/default
index 3aa6e820ea..50bca6c024 100644
--- a/config/armv7hl/default
+++ b/config/armv7hl/default
@@ -4758,8 +4758,7 @@ CONFIG_DRM_UDL=m
CONFIG_DRM_ARMADA=m
CONFIG_DRM_RCAR_DU=m
CONFIG_DRM_SHMOBILE=m
-CONFIG_DRM_OMAP=m
-CONFIG_DRM_OMAP_NUM_CRTCS=2
+# CONFIG_DRM_OMAP is not set
CONFIG_DRM_TILCDC=y
# CONFIG_DRM_QXL is not set
# CONFIG_DRM_BOCHS is not set
diff --git a/config/armv7hl/lpae b/config/armv7hl/lpae
index f73c55164e..827762596a 100644
--- a/config/armv7hl/lpae
+++ b/config/armv7hl/lpae
@@ -4497,8 +4497,7 @@ CONFIG_DRM_UDL=m
# CONFIG_DRM_MGAG200 is not set
# CONFIG_DRM_CIRRUS_QEMU is not set
CONFIG_DRM_ARMADA=m
-CONFIG_DRM_OMAP=m
-CONFIG_DRM_OMAP_NUM_CRTCS=2
+# CONFIG_DRM_OMAP is not set
CONFIG_DRM_TILCDC=m
# CONFIG_DRM_QXL is not set
# CONFIG_DRM_BOCHS is not set