diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-06-30 07:18:21 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-06-30 07:18:21 +0200 |
| commit | 6d8b0273eaed6efa6578207261a10f3d151579c0 (patch) | |
| tree | 00281ba7311d79277d3617a494b4257d138177db | |
| parent | f89d0ae26f006e22d164c340dac00c3cb9efeab5 (diff) | |
| parent | 5a9500992f1dfa70d7b7983397570447d9cdf908 (diff) | |
| download | kernel-4.12.0-0.rc7.git2.1.vanilla.knurd.1.fc26.tar.gz kernel-4.12.0-0.rc7.git2.1.vanilla.knurd.1.fc26.tar.xz kernel-4.12.0-0.rc7.git2.1.vanilla.knurd.1.fc26.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.12.0-0.rc7.git2.1.vanilla.knurd.1.fc26kernel-4.12.0-0.rc7.git2.1.vanilla.knurd.1.fc25
| -rw-r--r-- | baseconfig/arm/CONFIG_DRM_MESON_DW_HDMI | 2 | ||||
| -rw-r--r-- | kernel-aarch64-debug.config | 2 | ||||
| -rw-r--r-- | kernel-aarch64.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-debug.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae-debug.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl.config | 2 | ||||
| -rw-r--r-- | kernel.spec | 3 |
8 files changed, 10 insertions, 7 deletions
diff --git a/baseconfig/arm/CONFIG_DRM_MESON_DW_HDMI b/baseconfig/arm/CONFIG_DRM_MESON_DW_HDMI index db9d818a2..2590929f1 100644 --- a/baseconfig/arm/CONFIG_DRM_MESON_DW_HDMI +++ b/baseconfig/arm/CONFIG_DRM_MESON_DW_HDMI @@ -1 +1 @@ -# CONFIG_DRM_MESON_DW_HDMI is not set +CONFIG_DRM_MESON_DW_HDMI=m diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index bb2455093..3f81bd79c 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -1261,7 +1261,7 @@ CONFIG_DRM_LVDS_ENCODER=m CONFIG_DRM=m CONFIG_DRM_MALI_DISPLAY=m # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set -# CONFIG_DRM_MESON_DW_HDMI is not set +CONFIG_DRM_MESON_DW_HDMI=m CONFIG_DRM_MESON=m CONFIG_DRM_MGAG200=m # CONFIG_DRM_MGA is not set diff --git a/kernel-aarch64.config b/kernel-aarch64.config index e09397467..832aa62ff 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -1251,7 +1251,7 @@ CONFIG_DRM_LVDS_ENCODER=m CONFIG_DRM=m CONFIG_DRM_MALI_DISPLAY=m # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set -# CONFIG_DRM_MESON_DW_HDMI is not set +CONFIG_DRM_MESON_DW_HDMI=m CONFIG_DRM_MESON=m CONFIG_DRM_MGAG200=m # CONFIG_DRM_MGA is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 48940dddf..1e8d9934a 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -1352,7 +1352,7 @@ CONFIG_DRM_LVDS_ENCODER=m CONFIG_DRM=m CONFIG_DRM_MALI_DISPLAY=m # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set -# CONFIG_DRM_MESON_DW_HDMI is not set +CONFIG_DRM_MESON_DW_HDMI=m CONFIG_DRM_MESON=m CONFIG_DRM_MGAG200=m # CONFIG_DRM_MGA is not set diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 5b179f2f9..4d5a5298c 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -1294,7 +1294,7 @@ CONFIG_DRM_LVDS_ENCODER=m CONFIG_DRM=m CONFIG_DRM_MALI_DISPLAY=m # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set -# CONFIG_DRM_MESON_DW_HDMI is not set +CONFIG_DRM_MESON_DW_HDMI=m CONFIG_DRM_MESON=m CONFIG_DRM_MGAG200=m # CONFIG_DRM_MGA is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 429783fa3..493b93292 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -1284,7 +1284,7 @@ CONFIG_DRM_LVDS_ENCODER=m CONFIG_DRM=m CONFIG_DRM_MALI_DISPLAY=m # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set -# CONFIG_DRM_MESON_DW_HDMI is not set +CONFIG_DRM_MESON_DW_HDMI=m CONFIG_DRM_MESON=m CONFIG_DRM_MGAG200=m # CONFIG_DRM_MGA is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 0e8030d81..71f677c09 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1342,7 +1342,7 @@ CONFIG_DRM_LVDS_ENCODER=m CONFIG_DRM=m CONFIG_DRM_MALI_DISPLAY=m # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set -# CONFIG_DRM_MESON_DW_HDMI is not set +CONFIG_DRM_MESON_DW_HDMI=m CONFIG_DRM_MESON=m CONFIG_DRM_MGAG200=m # CONFIG_DRM_MGA is not set diff --git a/kernel.spec b/kernel.spec index b902e99a9..204760a06 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2217,6 +2217,9 @@ fi # # %changelog +* Thu Jun 29 2017 Peter Robinson <pbrobinson@fedoraproject.org> +- Enable HDMI on Amlogic Meson SoCs + * Thu Jun 29 2017 Laura Abbott <labbott@fedoraproject.org> - 4.12.0-0.rc7.git2.1 - Linux v4.12-rc7-25-g6474924 |