diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-07-14 07:56:35 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-07-14 07:56:35 +0200 |
commit | 2ff296eb0007dfeeb9755870cdba3e80caa3e213 (patch) | |
tree | ddc60561321f02f03cf3e1180fc93ae7f1053849 /kernel-i686-PAE.config | |
parent | ba06d1672cfd783e5d3733acc84e5885604be53c (diff) | |
parent | b48b5d7577f48ebf03079e69dec56a56defbf583 (diff) | |
download | kernel-4.13.0-0.rc0.git7.1.vanilla.knurd.1.fc26.tar.gz kernel-4.13.0-0.rc0.git7.1.vanilla.knurd.1.fc26.tar.xz kernel-4.13.0-0.rc0.git7.1.vanilla.knurd.1.fc26.zip |
Merge remote-tracking branch 'origin/master'kernel-4.13.0-0.rc0.git7.1.vanilla.knurd.1.fc26kernel-4.13.0-0.rc0.git7.1.vanilla.knurd.1.fc25
Diffstat (limited to 'kernel-i686-PAE.config')
-rw-r--r-- | kernel-i686-PAE.config | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 6afdbd2f7..dc2d342c1 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -1886,6 +1886,7 @@ CONFIG_I2C_DESIGNWARE_CORE=y # CONFIG_I2C_DESIGNWARE is not set CONFIG_I2C_DESIGNWARE_PCI=m CONFIG_I2C_DESIGNWARE_PLATFORM=y +CONFIG_I2C_DESIGNWARE_SLAVE=y CONFIG_I2C_DIOLAN_U2C=m # CONFIG_I2C_EG20T is not set # CONFIG_I2C_EMEV2 is not set @@ -1897,7 +1898,7 @@ CONFIG_I2C_ISCH=m CONFIG_I2C_ISMT=m CONFIG_I2C_MLXCPLD=m # CONFIG_I2C_MUX_GPIO is not set -# CONFIG_I2C_MUX_GPMUX is not set +CONFIG_I2C_MUX_GPMUX=m CONFIG_I2C_MUX_LTC4306=m CONFIG_I2C_MUX=m CONFIG_I2C_MUX_MLXCPLD=m @@ -1980,7 +1981,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 CONFIG_IIO_INTERRUPT_TRIGGER=m CONFIG_IIO_KFIFO_BUF=m CONFIG_IIO=m -# CONFIG_IIO_MUX is not set +CONFIG_IIO_MUX=m # CONFIG_IIO_SIMPLE_DUMMY is not set # CONFIG_IIO_SSP_SENSORHUB is not set CONFIG_IIO_ST_ACCEL_3AXIS=m @@ -3712,6 +3713,7 @@ CONFIG_OPTPROBES=y CONFIG_ORANGEFS_FS=m CONFIG_ORINOCO_USB=m CONFIG_OSF_PARTITION=y +# CONFIG_OVERLAY_FS_INDEX is not set CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set CONFIG_P54_COMMON=m @@ -4870,6 +4872,7 @@ CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m +CONFIG_SND_SIMPLE_CARD_UTILS=m CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m CONFIG_SND_SOC_AC97_CODEC=m @@ -4965,7 +4968,6 @@ CONFIG_SND_SOC_NAU8824=m # CONFIG_SND_SOC_PCM3168A_SPI is not set # CONFIG_SND_SOC_PCM512x_I2C is not set # CONFIG_SND_SOC_PCM512x_SPI is not set -# CONFIG_SND_SOC_ROCKCHIP_PDM is not set # CONFIG_SND_SOC_RT5616 is not set # CONFIG_SND_SOC_RT5631 is not set # CONFIG_SND_SOC_SGTL5000 is not set @@ -5848,8 +5850,6 @@ CONFIG_VIDEO_NOON010PC30=m CONFIG_VIDEO_PVRUSB2_DVB=y CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y -# CONFIG_VIDEO_QCOM_VENUS is not set -# CONFIG_VIDEO_RENESAS_VSP1 is not set CONFIG_VIDEO_SAA6588=m CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_DVB=m |