diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2017-05-10 18:20:47 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2017-05-10 18:20:47 +0100 |
| commit | ed622fefe80435df0a0a56f2371cd1b024b7ac82 (patch) | |
| tree | 72abfd2228cd63207f29b4cb743e38f19ae06376 /kernel-armv7hl.config | |
| parent | 48953e19ba24578846ec4aebbbbc0b89ff539b4c (diff) | |
| download | kernel-ed622fefe80435df0a0a56f2371cd1b024b7ac82.tar.gz kernel-ed622fefe80435df0a0a56f2371cd1b024b7ac82.tar.xz kernel-ed622fefe80435df0a0a56f2371cd1b024b7ac82.zip | |
minor merge window cleanups
Diffstat (limited to 'kernel-armv7hl.config')
| -rw-r--r-- | kernel-armv7hl.config | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 2e9180921..45605ce52 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 @@ -5718,6 +5714,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 |