diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2019-12-26 01:50:22 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2019-12-26 01:51:04 +0000 |
| commit | ebd935120d25855b0dc2bda8ae815f5095dfffd8 (patch) | |
| tree | 6849ba1b13a3e79c2a2ebe11a3294437a32d167d | |
| parent | 1a30f6ef602de62876e531ea3730ecc185a4c729 (diff) | |
| parent | 6c38ed53938025d54969fd431e7e365a23eb905b (diff) | |
| download | kernel_replicant_linux-ebd935120d25855b0dc2bda8ae815f5095dfffd8.tar.gz kernel_replicant_linux-ebd935120d25855b0dc2bda8ae815f5095dfffd8.tar.bz2 kernel_replicant_linux-ebd935120d25855b0dc2bda8ae815f5095dfffd8.zip | |
Merge branch 'sid'
Move the changes pending for 5.3.15-2 into the top changelog
entry, as we won't upload any more 5.3-based versions.
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/config/arm64/config | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 32772818f696..b214319885db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -378,6 +378,10 @@ linux (5.4.6-1~exp1) UNRELEASED; urgency=medium * [mips*] enable CONFIG_MIPS_O32_FP64_SUPPORT. * [mips*] enable CONFIG_CPU_HAS_MSA except octeon. + [ Vagrant Cascadian ] + * [arm64] drivers/gpu/drm/sun4i: Enable DRM_SUN8I_MIXER as a module. + (Closes: #946510). Thanks to Andrei POPESCU. + -- Ben Hutchings <ben@decadent.org.uk> Thu, 05 Dec 2019 17:31:13 +0000 linux (5.4.2-1~exp1) experimental; urgency=medium diff --git a/debian/config/arm64/config b/debian/config/arm64/config index 7e71d1bd8900..9841e44ce42f 100644 --- a/debian/config/arm64/config +++ b/debian/config/arm64/config @@ -361,6 +361,7 @@ CONFIG_ROCKCHIP_DW_MIPI_DSI=y ## CONFIG_DRM_SUN4I=m CONFIG_DRM_SUN8I_DW_HDMI=m +CONFIG_DRM_SUN8I_MIXER=m ## ## file: drivers/gpu/drm/tegra/Kconfig |