summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--baseconfig/arm/armv7/CONFIG_DRM_STI2
-rw-r--r--kernel-armv7hl-debug.config2
-rw-r--r--kernel-armv7hl-lpae-debug.config2
-rw-r--r--kernel-armv7hl-lpae.config2
-rw-r--r--kernel-armv7hl.config2
-rw-r--r--kernel.spec3
6 files changed, 8 insertions, 5 deletions
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_STI b/baseconfig/arm/armv7/CONFIG_DRM_STI
index 008714f93..d16e09b9b 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_STI
+++ b/baseconfig/arm/armv7/CONFIG_DRM_STI
@@ -1 +1 @@
-# CONFIG_DRM_STI is not set
+CONFIG_DRM_STI=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index db30b0dff..5ce611660 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1397,7 +1397,7 @@ CONFIG_DRM_ROCKCHIP=m
# CONFIG_DRM_SII902X is not set
CONFIG_DRM_SIL_SII8620=m
# CONFIG_DRM_SIS is not set
-# CONFIG_DRM_STI is not set
+CONFIG_DRM_STI=m
CONFIG_DRM_SUN4I=m
# CONFIG_DRM_TDFX is not set
# CONFIG_DRM_TEGRA_DEBUG is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 845532ac5..12cfa68a1 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1321,7 +1321,7 @@ CONFIG_DRM_ROCKCHIP=m
# CONFIG_DRM_SII902X is not set
CONFIG_DRM_SIL_SII8620=m
# CONFIG_DRM_SIS is not set
-# CONFIG_DRM_STI is not set
+CONFIG_DRM_STI=m
CONFIG_DRM_SUN4I=m
# CONFIG_DRM_TDFX is not set
# CONFIG_DRM_TEGRA_DEBUG is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 9dff4cdd4..0324b0036 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1311,7 +1311,7 @@ CONFIG_DRM_ROCKCHIP=m
# CONFIG_DRM_SII902X is not set
CONFIG_DRM_SIL_SII8620=m
# CONFIG_DRM_SIS is not set
-# CONFIG_DRM_STI is not set
+CONFIG_DRM_STI=m
CONFIG_DRM_SUN4I=m
# CONFIG_DRM_TDFX is not set
# CONFIG_DRM_TEGRA_DEBUG is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 6db1bb12e..0484059b5 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1387,7 +1387,7 @@ CONFIG_DRM_ROCKCHIP=m
# CONFIG_DRM_SII902X is not set
CONFIG_DRM_SIL_SII8620=m
# CONFIG_DRM_SIS is not set
-# CONFIG_DRM_STI is not set
+CONFIG_DRM_STI=m
CONFIG_DRM_SUN4I=m
# CONFIG_DRM_TDFX is not set
# CONFIG_DRM_TEGRA_DEBUG is not set
diff --git a/kernel.spec b/kernel.spec
index c33ef11d4..ca2138c75 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2169,6 +2169,9 @@ fi
#
#
%changelog
+* Sun Apr 1 2017 Peter Robinson <pbrobinson@fedoraproject.org>
+- Enable STi DRM driver
+
* Thu Mar 30 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc4.git3.1
- Linux v4.11-rc4-64-g89970a0