From: Todd Vierling <todd.vierling@oracle.com>
Date: Tue, 10 May 2016 22:50:57 +0000 (-0400)
Subject: uek-rpm: ol6: revert DRM for experimental or OL6-incompatible drivers
X-Git-Tag: v4.1.12-92~157^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b21c8b7e6ae93c5eafc83cddcc0c9ec29ae6ad4d;p=users%2Fjedix%2Flinux-maple.git

uek-rpm: ol6: revert DRM for experimental or OL6-incompatible drivers

Orabug: 22202036

Signed-off-by: Todd Vierling <todd.vierling@oracle.com>
---

diff --git a/uek-rpm/ol6/config-x86_64 b/uek-rpm/ol6/config-x86_64
index 8a563d9b3012c..abe7208fcf7b8 100644
--- a/uek-rpm/ol6/config-x86_64
+++ b/uek-rpm/ol6/config-x86_64
@@ -4329,14 +4329,12 @@ CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VMWGFX=m
 CONFIG_DRM_VMWGFX_FBCON=y
-CONFIG_DRM_GMA500=m
-CONFIG_DRM_GMA600=y
-CONFIG_DRM_GMA3600=y
+# CONFIG_DRM_GMA500 is not set
 CONFIG_DRM_UDL=m
-CONFIG_DRM_AST=m
-CONFIG_DRM_MGAG200=m
-CONFIG_DRM_CIRRUS_QEMU=m
-CONFIG_DRM_QXL=m
+# CONFIG_DRM_AST is not set
+# CONFIG_DRM_MGAG200 is not set
+# CONFIG_DRM_CIRRUS_QEMU is not set
+# CONFIG_DRM_QXL is not set
 CONFIG_DRM_BOCHS=m
 CONFIG_DRM_PANEL=y
 
diff --git a/uek-rpm/ol6/config-x86_64-debug b/uek-rpm/ol6/config-x86_64-debug
index d15e08ef51b91..5fab9f59bdc83 100644
--- a/uek-rpm/ol6/config-x86_64-debug
+++ b/uek-rpm/ol6/config-x86_64-debug
@@ -4322,14 +4322,12 @@ CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VMWGFX=m
 CONFIG_DRM_VMWGFX_FBCON=y
-CONFIG_DRM_GMA500=m
-CONFIG_DRM_GMA600=y
-CONFIG_DRM_GMA3600=y
+# CONFIG_DRM_GMA500 is not set
 CONFIG_DRM_UDL=m
-CONFIG_DRM_AST=m
-CONFIG_DRM_MGAG200=m
-CONFIG_DRM_CIRRUS_QEMU=m
-CONFIG_DRM_QXL=m
+# CONFIG_DRM_AST is not set
+# CONFIG_DRM_MGAG200 is not set
+# CONFIG_DRM_CIRRUS_QEMU is not set
+# CONFIG_DRM_QXL is not set
 CONFIG_DRM_BOCHS=m
 CONFIG_DRM_PANEL=y