summaryrefslogtreecommitdiffstats
path: root/config-x86-generic
diff options
context:
space:
mode:
authorAdam Williamson <awilliam@redhat.com>2014-11-08 15:30:23 -0800
committerAdam Williamson <awilliam@redhat.com>2014-11-08 15:30:23 -0800
commit54fd44e88b6ac3a9bf79ff07a96df87900b437bd (patch)
tree6867abf45fd75794660d6e2f0fb9187be39a96c9 /config-x86-generic
parent89b19396f6c5dd09eaf8f44bcee27d42a2da1502 (diff)
downloadkernel-54fd44e88b6ac3a9bf79ff07a96df87900b437bd.tar.gz
kernel-54fd44e88b6ac3a9bf79ff07a96df87900b437bd.tar.xz
kernel-54fd44e88b6ac3a9bf79ff07a96df87900b437bd.zip
adjust patch set for 3.18: rediffs and drops
Once again try a 'real' fix for ACPI _DEP (the one currently in upstream review). Re-diff the ath6kl SDIO ID patch. Drop the UEFI 'big arse revert', should be merged upstream now. For now do not apply the mic fix patch as I *think* a correct fix has gone upstream: http://mailman.alsa-project.org/pipermail/alsa-devel/2014-October/081780.html Update config-x86-generic with a bunch more ASoC drivers to disable.
Diffstat (limited to 'config-x86-generic')
-rw-r--r--config-x86-generic5
1 files changed, 5 insertions, 0 deletions
diff --git a/config-x86-generic b/config-x86-generic
index 917b20d34..e1da139a3 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -258,6 +258,11 @@ CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m
# CONFIG_SND_SOC_TAS2552 is not set
# CONFIG_SND_SOC_TLV320AIC31XX is not set
# CONFIG_SND_SOC_WM8770 is not set
+# CONFIG_SND_SOC_CS35L32 is not set
+# CONFIG_SND_SOC_ES8328 is not set
+# CONFIG_SND_SOC_SSM2602_I2C is not set
+# CONFIG_SND_SOC_SSM4567 is not set
+# CONFIG_SND_SOC_WM8978 is not set
# Baytrail other (from pbrobinson)