diff options
author | Vagrant Cascadian <vagrant@debian.org> | 2018-07-01 15:48:12 +0000 |
---|---|---|
committer | Vagrant Cascadian <vagrant@debian.org> | 2018-07-01 15:48:12 +0000 |
commit | 6a3bb899a3b7b318a9fc4387dab8956866dd53d4 (patch) | |
tree | 114d71d9db38647fdd9b02f0cbdcd38715a19b6b | |
parent | f12a5bd06361f5a779f7171a06053dec5e22f037 (diff) | |
parent | 8fdd4da200a6737663a340801302485d8c1383a1 (diff) | |
download | kernel_replicant_linux-6a3bb899a3b7b318a9fc4387dab8956866dd53d4.tar.gz kernel_replicant_linux-6a3bb899a3b7b318a9fc4387dab8956866dd53d4.tar.bz2 kernel_replicant_linux-6a3bb899a3b7b318a9fc4387dab8956866dd53d4.zip |
Merge branch 'sid' into 'sid'
[armhf] Enable missing SND_EDMA_SOC for davinci-mcasp on BeagleBoneBlack
See merge request kernel-team/linux!39
-rw-r--r-- | debian/changelog | 1 | ||||
-rw-r--r-- | debian/config/armhf/config | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 116be9171cad..9757f9d97726 100644 --- a/debian/changelog +++ b/debian/changelog @@ -92,6 +92,7 @@ linux (4.17.3-1) UNRELEASED; urgency=medium [ Romain Perier ] * [x86] amdgpu: Enable DCN 1.0 Raven family (Closes: #901349) + * [armhf] Enable missing SND_EDMA_SOC for davinci-mcasp on the BeagleBoneBlack [ Vagrant Cascadian ] * [arm64] Add device-tree to support Pinebook. diff --git a/debian/config/armhf/config b/debian/config/armhf/config index c2d83403f535..cedcf3d27ac6 100644 --- a/debian/config/armhf/config +++ b/debian/config/armhf/config @@ -1325,6 +1325,11 @@ CONFIG_NET_SWITCHDEV=y CONFIG_SND_HDA_TEGRA=m ## +## file: sound/soc/davinci/Kconfig +## +CONFIG_SND_EDMA_SOC=m + +## ## file: sound/soc/Kconfig ## CONFIG_SND_SOC=m |