diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-11-26 16:51:00 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-11-27 09:26:42 -0500 |
| commit | 96440958bcce1ee3b72ba020c32883693390bf5b (patch) | |
| tree | 1907b155bda3248b4980109a279f8b19bae47d18 /config-x86-generic | |
| parent | 06ec1977a7a2c0536ca0f2e7d79ed3b8c0699553 (diff) | |
| download | kernel-96440958bcce1ee3b72ba020c32883693390bf5b.tar.gz kernel-96440958bcce1ee3b72ba020c32883693390bf5b.tar.xz kernel-96440958bcce1ee3b72ba020c32883693390bf5b.zip | |
Revert "Merge branch 'master' into baytrail"
This reverts commit 7511bcf2e6ddc31ee27418487f2d4b7d93bed1e2, reversing
changes made to cd44fa829c5e8255bf623a4b072cf85bb61b3092.
This should get the tree back to the state it was before the errant push.
The history will be ugly because Fedora disallows force pushing (sigh), but
oh well.
Diffstat (limited to 'config-x86-generic')
| -rw-r--r-- | config-x86-generic | 84 |
1 files changed, 0 insertions, 84 deletions
diff --git a/config-x86-generic b/config-x86-generic index 79a3f4482..88347fede 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -190,90 +190,6 @@ CONFIG_EDAC_IE31200=m CONFIG_SCHED_MC=y -CONFIG_SND_ISA=y -CONFIG_SND_ES18XX=m - -# Baytrail sound -CONFIG_PWM_LPSS=m -CONFIG_SND_SOC=m -CONFIG_SND_SIMPLE_CARD=m -CONFIG_SND_DESIGNWARE_I2S=m -CONFIG_SND_ATMEL_SOC=m -CONFIG_SND_SOC_INTEL_SST=m -CONFIG_SND_SOC_INTEL_SST_ACPI=m -CONFIG_SND_SOC_INTEL_HASWELL_MACH=m -CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m -CONFIG_SND_SOC_INTEL_BAYTRAIL=m -CONFIG_SND_SOC_RT286=m -CONFIG_SND_SOC_RT5640=m -CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH=m -CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m - -# no no no -# CONFIG_SND_SOC_ADAU1701 is not set -# CONFIG_SND_SOC_AK4554 is not set -# CONFIG_SND_SOC_AK4642 is not set -# CONFIG_SND_SOC_AK5386 is not set -# CONFIG_SND_SOC_CS42L52 is not set -# CONFIG_SND_SOC_CS42L73 is not set -# CONFIG_SND_SOC_CS4270 is not set -# CONFIG_SND_SOC_CS4271 is not set -# CONFIG_SND_SOC_CS42XX8_I2C is not set -# CONFIG_SND_SOC_HDMI_CODEC is not set -# CONFIG_SND_SOC_PCM1681 is not set -# CONFIG_SND_SOC_PCM512x_I2C is not set -# CONFIG_SND_SOC_SGTL5000 is not set -# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set -# CONFIG_SND_SOC_SPDIF is not set -# CONFIG_SND_SOC_TAS5086 is not set -# CONFIG_SND_SOC_TLV320AIC3X is not set -# CONFIG_SND_SOC_WM8510 is not set -# CONFIG_SND_SOC_WM8523 is not set -# CONFIG_SND_SOC_WM8580 is not set -# CONFIG_SND_SOC_WM8711 is not set -# CONFIG_SND_SOC_WM8728 is not set -# CONFIG_SND_SOC_WM8731 is not set -# CONFIG_SND_SOC_WM8737 is not set -# CONFIG_SND_SOC_WM8741 is not set -# CONFIG_SND_SOC_WM8750 is not set -# CONFIG_SND_SOC_WM8753 is not set -# CONFIG_SND_SOC_WM8776 is not set -# CONFIG_SND_SOC_WM8804 is not set -# CONFIG_SND_SOC_WM8903 is not set -# CONFIG_SND_SOC_WM8962 is not set -# CONFIG_SND_SOC_TPA6130A2 is not set -# CONFIG_SND_SOC_FSL_SAI is not set -# CONFIG_SND_SOC_FSL_SSI is not set -# CONFIG_SND_SOC_FSL_SPDIF is not set -# CONFIG_SND_SOC_FSL_ESAI is not set -# CONFIG_SND_SOC_IMX_AUDMUX is not set -# CONFIG_SND_SOC_ALC5623 is not set -# CONFIG_SND_SOC_CS42L56 is not set -# CONFIG_SND_SOC_STA350 is not set -# CONFIG_SND_SOC_FSL_ASRC is not set -# CONFIG_SND_SOC_AK4104 is not set -# CONFIG_SND_SOC_CS4265 is not set -# CONFIG_SND_SOC_PCM1792A is not set -# CONFIG_SND_SOC_PCM512x_SPI is not set -# 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) -CONFIG_INTEL_SOC_PMIC=y -CONFIG_GPIO_CRYSTAL_COVE=m -CONFIG_MFD_CORE=m -CONFIG_REGMAP_I2C=m -# https://lkml.org/lkml/2013/5/13/175 -CONFIG_SPI_PXA2XX=m -CONFIG_SPI_PXA2XX_PCI=m - CONFIG_TCG_INFINEON=m CONFIG_HW_RANDOM_INTEL=m |