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-armv7hl.config | |
| parent | b7e2a7c96a3a2a02101d613947069c3a7aef0848 (diff) | |
| parent | 651cbd3f9316e873cc4ff6d46aa7aef6550d192e (diff) | |
| download | kernel-4.12.0-0.rc0.git8.1.vanilla.knurd.1.fc25.tar.gz kernel-4.12.0-0.rc0.git8.1.vanilla.knurd.1.fc25.tar.xz kernel-4.12.0-0.rc0.git8.1.vanilla.knurd.1.fc25.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-armv7hl.config')
| -rw-r--r-- | kernel-armv7hl.config | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 2e9180921..38fced71d 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1016,7 +1016,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_EXYNOS_RNG=m @@ -1529,7 +1528,6 @@ CONFIG_EDAC_GHES=y CONFIG_EDAC_HIGHBANK_L2=m CONFIG_EDAC_HIGHBANK_MC=m CONFIG_EDAC_LEGACY_SYSFS=y -CONFIG_EDAC_MM_EDAC=m CONFIG_EDAC_MV64X60=m CONFIG_EDAC_SYNOPSYS=m CONFIG_EDAC=y @@ -2055,7 +2053,6 @@ CONFIG_HWMON=y CONFIG_HW_PERF_EVENTS=y CONFIG_HWPOISON_INJECT=m CONFIG_HW_RANDOM_BCM2835=m -CONFIG_HW_RANDOM_EXYNOS=m CONFIG_HW_RANDOM_MESON=m CONFIG_HW_RANDOM_MSM=m CONFIG_HW_RANDOM_MXC_RNGA=m @@ -2881,7 +2878,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 @@ -4720,6 +4716,7 @@ CONFIG_RTC_DRV_AS3722=y 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_DA9052=m CONFIG_RTC_DRV_DA9055=m CONFIG_RTC_DRV_DS1286=m @@ -4839,7 +4836,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 @@ -5718,6 +5715,7 @@ CONFIG_SOC_OMAP5=y CONFIG_SOC_STIH407=y # CONFIG_SOC_STIH415 is not set # CONFIG_SOC_STIH416 is not set +CONFIG_SOC_TEGRA_FLOWCTRL=y CONFIG_SOC_TI81XX=y # CONFIG_SOC_TI is not set # CONFIG_SOC_VF610 is not set @@ -5845,6 +5843,7 @@ CONFIG_SUN6I_A31_CCU=y CONFIG_SUN8I_A23_CCU=y CONFIG_SUN8I_A33_CCU=y CONFIG_SUN8I_H3_CCU=y +CONFIG_SUN8I_R_CCU=y CONFIG_SUN8I_V3S_CCU=y CONFIG_SUN9I_A80_CCU=y CONFIG_SUNDANCE=m @@ -5943,6 +5942,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set CONFIG_TCS3472=m +# CONFIG_TEE is not set CONFIG_TEGRA124_EMC=y CONFIG_TEGRA20_APB_DMA=y CONFIG_TEGRA20_MC=y |