Merge branch 'sf/linux-sid' into sid

Enable SND_SOC_SPDIF on armmp-lpae

See merge request kernel-team/linux!137
This commit is contained in:
Ben Hutchings 2019-04-09 01:19:39 +01:00
commit 1acfe734b7
3 changed files with 8 additions and 1 deletions

3
debian/changelog vendored
View File

@ -800,6 +800,9 @@ linux (4.19.34-1) UNRELEASED; urgency=medium
[ YunQiang Su ]
* [mips*r6] Re-enable CONFIG_JUMP_LABEL, which has been fixed in upstream.
[ Stefan Fritsch ]
* [armhf] Enable SND_SOC_SPDIF for Cubietruck (Closes: #884562)
-- Ben Hutchings <ben@decadent.org.uk> Mon, 18 Mar 2019 22:50:08 +0000
linux (4.19.28-2) unstable; urgency=medium

View File

@ -1357,6 +1357,11 @@ CONFIG_SND_SOC=m
##
CONFIG_SND_BCM2835_SOC_I2S=m
##
## file: sound/soc/codecs/Kconfig
##
CONFIG_SND_SOC_SPDIF=y
##
## file: sound/soc/davinci/Kconfig
##

View File

@ -18,4 +18,3 @@ CONFIG_ARM_LPAE=y
## file: drivers/iommu/Kconfig
##
CONFIG_ARM_SMMU=y