diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-05-12 07:18:04 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-05-12 07:18:04 +0200 |
commit | 0695f06e29170d1ad1c8369303526dedb4e1ac4b (patch) | |
tree | c271b8be3f472138fa50d2cb7cc87d9162e88a51 /kernel-ppc64p7.config | |
parent | b7e2a7c96a3a2a02101d613947069c3a7aef0848 (diff) | |
parent | 651cbd3f9316e873cc4ff6d46aa7aef6550d192e (diff) | |
download | kernel-0695f06e29170d1ad1c8369303526dedb4e1ac4b.tar.gz kernel-0695f06e29170d1ad1c8369303526dedb4e1ac4b.tar.xz kernel-0695f06e29170d1ad1c8369303526dedb4e1ac4b.zip |
Merge remote-tracking branch 'origin/master'kernel-4.12.0-0.rc0.git8.1.vanilla.knurd.1.fc27kernel-4.12.0-0.rc0.git8.1.vanilla.knurd.1.fc26kernel-4.12.0-0.rc0.git8.1.vanilla.knurd.1.fc25kernel-4.12.0-0.rc0.git8.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-ppc64p7.config')
-rw-r--r-- | kernel-ppc64p7.config | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config index e4ccec690..408206bac 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -783,7 +783,6 @@ CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_DES=m -# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set # CONFIG_CRYPTO_DEV_CCREE is not set CONFIG_CRYPTO_DEV_CHELSIO=m # CONFIG_CRYPTO_DEV_FSL_CAAM is not set @@ -1183,7 +1182,6 @@ CONFIG_ECRYPT_FS=m # CONFIG_EDAC_DEBUG is not set CONFIG_EDAC_GHES=y CONFIG_EDAC_LEGACY_SYSFS=y -CONFIG_EDAC_MM_EDAC=m # CONFIG_EDAC_MPC85XX is not set CONFIG_EDAC=y CONFIG_EEPROM_93CX6=m @@ -2434,7 +2432,6 @@ CONFIG_LIRC_BT829=m CONFIG_LIRC_IMON=m CONFIG_LIRC=m CONFIG_LIRC_PARALLEL=m -CONFIG_LIRC_SASEM=m CONFIG_LIRC_SERIAL=m CONFIG_LIRC_SERIAL_TRANSMITTER=y CONFIG_LIRC_SIR=m @@ -3901,6 +3898,7 @@ CONFIG_RTC_DRV_ABX80X=m CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_CMOS=y +# CONFIG_RTC_DRV_CPCAP is not set CONFIG_RTC_DRV_DS1286=m # CONFIG_RTC_DRV_DS1302 is not set CONFIG_RTC_DRV_DS1305=m @@ -3997,7 +3995,7 @@ CONFIG_RTL8192SE=m # CONFIG_RTL8192U is not set CONFIG_RTL8723AE=m CONFIG_RTL8723BE=m -# CONFIG_RTL8723BS is not set +CONFIG_RTL8723BS=m CONFIG_RTL8821AE=m CONFIG_RTL8XXXU=m CONFIG_RTL8XXXU_UNTESTED=y @@ -4898,6 +4896,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set +# CONFIG_TEE is not set CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m |