diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-04-16 10:55:18 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-04-16 10:55:18 -0400 |
commit | 84326caccc8490832cb7df55177c1fe2d603b9c4 (patch) | |
tree | ff4575dce4df4ecf08a768b20de9bfd8c9a3d32a /config-generic | |
parent | 6bfd0600ec390b1d339c46c9b4db5fa263f9fa38 (diff) | |
download | kernel-84326caccc8490832cb7df55177c1fe2d603b9c4.tar.gz kernel-84326caccc8490832cb7df55177c1fe2d603b9c4.tar.xz kernel-84326caccc8490832cb7df55177c1fe2d603b9c4.zip |
Linux v4.0-6817-geea3a00264cf
Diffstat (limited to 'config-generic')
-rw-r--r-- | config-generic | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config-generic b/config-generic index e24f33c46..c16872f29 100644 --- a/config-generic +++ b/config-generic @@ -2386,6 +2386,7 @@ CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m # CONFIG_TCG_INFINEON is not set # CONFIG_TCG_TIS_I2C_ST33 is not set +# CONFIG_TCG_TIS_ST33ZP24 is not set # CONFIG_TCG_XEN is not set CONFIG_TELCLOCK=m @@ -4588,6 +4589,7 @@ CONFIG_CRYPTO_FIPS=y CONFIG_CRYPTO_USER_API_HASH=y CONFIG_CRYPTO_USER_API_SKCIPHER=y CONFIG_CRYPTO_USER_API_RNG=y +CONFIG_CRYPTO_USER_API_AEAD=y CONFIG_CRYPTO_MANAGER=y # Note, CONFIG_CRYPTO_MANAGER_DISABLE_TESTS needs to be unset, or FIPS will be disabled. # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set @@ -4880,6 +4882,7 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_SOC_PCM1792A is not set # CONFIG_SND_SOC_PCM512x_I2C is not set # CONFIG_SND_SOC_PCM512x_SPI is not set +# CONFIG_SND_SOC_QCOM is not set # CONFIG_SND_SOC_SGTL5000 is not set # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set # CONFIG_SND_SOC_TAS5086 is not set @@ -4897,6 +4900,8 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_SOC_WM8770 is not set # CONFIG_SND_SOC_WM8776 is not set # CONFIG_SND_SOC_WM8804 is not set +# CONFIG_SND_SOC_WM8804_I2C is not set +# CONFIG_SND_SOC_WM8804_SPI is not set # CONFIG_SND_SOC_WM8903 is not set # CONFIG_SND_SOC_WM8962 is not set # CONFIG_SND_SOC_TPA6130A2 is not set @@ -4955,6 +4960,7 @@ CONFIG_LEDS_DELL_NETBOOKS=m # CONFIG_LEDS_LP8501 is not set # CONFIG_LEDS_LP8860 is not set # CONFIG_LEDS_PCA963X is not set +# CONFIG_LEDS_PM8941_WLED is not set # CONFIG_LEDS_SYSCON is not set CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m |