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:
commit
1acfe734b7
|
@ -800,6 +800,9 @@ linux (4.19.34-1) UNRELEASED; urgency=medium
|
||||||
[ YunQiang Su ]
|
[ YunQiang Su ]
|
||||||
* [mips*r6] Re-enable CONFIG_JUMP_LABEL, which has been fixed in upstream.
|
* [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
|
-- Ben Hutchings <ben@decadent.org.uk> Mon, 18 Mar 2019 22:50:08 +0000
|
||||||
|
|
||||||
linux (4.19.28-2) unstable; urgency=medium
|
linux (4.19.28-2) unstable; urgency=medium
|
||||||
|
|
|
@ -1357,6 +1357,11 @@ CONFIG_SND_SOC=m
|
||||||
##
|
##
|
||||||
CONFIG_SND_BCM2835_SOC_I2S=m
|
CONFIG_SND_BCM2835_SOC_I2S=m
|
||||||
|
|
||||||
|
##
|
||||||
|
## file: sound/soc/codecs/Kconfig
|
||||||
|
##
|
||||||
|
CONFIG_SND_SOC_SPDIF=y
|
||||||
|
|
||||||
##
|
##
|
||||||
## file: sound/soc/davinci/Kconfig
|
## file: sound/soc/davinci/Kconfig
|
||||||
##
|
##
|
||||||
|
|
|
@ -18,4 +18,3 @@ CONFIG_ARM_LPAE=y
|
||||||
## file: drivers/iommu/Kconfig
|
## file: drivers/iommu/Kconfig
|
||||||
##
|
##
|
||||||
CONFIG_ARM_SMMU=y
|
CONFIG_ARM_SMMU=y
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue