Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-08-13 18:23:31 +0200
committerTakashi Iwai <tiwai@suse.de>2014-08-13 18:23:31 +0200
commit07174c16be00c496cc0673d2366407e825f11827 (patch)
treef0ff1357be52cdbf5f5cfa79c063c66a0596dfab
parentee3abc8148fe18e205ab92847089d4bfb2cffd2f (diff)
Revert "config: armv7hl: Disable OMAP DRM"
This reverts commit f92487dbd7a305531e4cc54c41609b8f77a1bc30. The previous commit should fix the build error of omapdrm.
-rw-r--r--config/armv7hl/default3
-rw-r--r--config/armv7hl/lpae3
2 files changed, 4 insertions, 2 deletions
diff --git a/config/armv7hl/default b/config/armv7hl/default
index 50bca6c024..3aa6e820ea 100644
--- a/config/armv7hl/default
+++ b/config/armv7hl/default
@@ -4758,7 +4758,8 @@ CONFIG_DRM_UDL=m
CONFIG_DRM_ARMADA=m
CONFIG_DRM_RCAR_DU=m
CONFIG_DRM_SHMOBILE=m
-# CONFIG_DRM_OMAP is not set
+CONFIG_DRM_OMAP=m
+CONFIG_DRM_OMAP_NUM_CRTCS=2
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 827762596a..f73c55164e 100644
--- a/config/armv7hl/lpae
+++ b/config/armv7hl/lpae
@@ -4497,7 +4497,8 @@ CONFIG_DRM_UDL=m
# CONFIG_DRM_MGAG200 is not set
# CONFIG_DRM_CIRRUS_QEMU is not set
CONFIG_DRM_ARMADA=m
-# CONFIG_DRM_OMAP is not set
+CONFIG_DRM_OMAP=m
+CONFIG_DRM_OMAP_NUM_CRTCS=2
CONFIG_DRM_TILCDC=m
# CONFIG_DRM_QXL is not set
# CONFIG_DRM_BOCHS is not set