diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-05-05 09:10:38 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-05-05 09:10:38 +0200 |
| commit | ccf4768e4692813db62c18b884c791b842fc82ed (patch) | |
| tree | 7df8f07e8ae920d4cdc68f7b131da2219ab36ed8 /config-x86_64-generic | |
| parent | 7717d3cdd707c45e5e8e2f013e96536b293dc2be (diff) | |
| parent | 4d81848a2b0f1040041a335551c14740202cf2ba (diff) | |
| download | kernel-4.5.3-300.vanilla.knurd.1.fc24.tar.gz kernel-4.5.3-300.vanilla.knurd.1.fc24.tar.xz kernel-4.5.3-300.vanilla.knurd.1.fc24.zip | |
Merge remote-tracking branch 'origin/f24' into f24-user-thl-vanilla-fedorakernel-4.5.3-300.vanilla.knurd.1.fc24
Diffstat (limited to 'config-x86_64-generic')
| -rw-r--r-- | config-x86_64-generic | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config-x86_64-generic b/config-x86_64-generic index 8d8b27519..5d0f7b2b2 100644 --- a/config-x86_64-generic +++ b/config-x86_64-generic @@ -231,3 +231,6 @@ CONFIG_INFINIBAND_HFI1=m CONFIG_HFI1_VERBS_31BIT_PSN=y # CONFIG_SDMA_VERBOSITY is not set # CONFIG_PRESCAN_RXQ is not set + +# Temporary workaround until SND_SOC_INTEL_HASWELL_MACH no longer requires builtin +CONFIG_DW_DMAC=y |